diff options
author | Will Deacon <will@kernel.org> | 2024-09-12 14:43:22 +0200 |
---|---|---|
committer | Will Deacon <will@kernel.org> | 2024-09-12 14:43:22 +0200 |
commit | 3175e051c3766047f645020d4a80a86321f7dcff (patch) | |
tree | 154403f22d507049027ccd6b0778a815bf018045 /arch/arm64/Kconfig | |
parent | Merge branch 'for-next/perf' into for-next/core (diff) | |
parent | arm64: smccc: Reserve block of KVM "vendor" services for pKVM hypercalls (diff) | |
download | linux-3175e051c3766047f645020d4a80a86321f7dcff.tar.xz linux-3175e051c3766047f645020d4a80a86321f7dcff.zip |
Merge branch 'for-next/pkvm-guest' into for-next/core
* for-next/pkvm-guest:
arm64: smccc: Reserve block of KVM "vendor" services for pKVM hypercalls
drivers/virt: pkvm: Intercept ioremap using pKVM MMIO_GUARD hypercall
arm64: mm: Add confidential computing hook to ioremap_prot()
drivers/virt: pkvm: Hook up mem_encrypt API using pKVM hypercalls
arm64: mm: Add top-level dispatcher for internal mem_encrypt API
drivers/virt: pkvm: Add initial support for running as a protected guest
firmware/smccc: Call arch-specific hook on discovering KVM services
Diffstat (limited to 'arch/arm64/Kconfig')
-rw-r--r-- | arch/arm64/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index c8cba20a4d11..3d62e4ffa1a0 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -34,6 +34,7 @@ config ARM64 select ARCH_HAS_KERNEL_FPU_SUPPORT if KERNEL_MODE_NEON select ARCH_HAS_KEEPINITRD select ARCH_HAS_MEMBARRIER_SYNC_CORE + select ARCH_HAS_MEM_ENCRYPT select ARCH_HAS_NMI_SAFE_THIS_CPU_OPS select ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE select ARCH_HAS_PTE_DEVMAP |