summaryrefslogtreecommitdiff
path: root/arch/arm64/mm/Makefile
diff options
context:
space:
mode:
authorWill Deacon <will@kernel.org>2024-09-12 13:43:22 +0100
committerWill Deacon <will@kernel.org>2024-09-12 13:43:22 +0100
commit3175e051c3766047f645020d4a80a86321f7dcff (patch)
tree154403f22d507049027ccd6b0778a815bf018045 /arch/arm64/mm/Makefile
parent119e3eef3262108c74d3f832372d8b74b7169c45 (diff)
parent21be9f7110d4c044c2b49bafbd7246335f236221 (diff)
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/mm/Makefile')
-rw-r--r--arch/arm64/mm/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/mm/Makefile b/arch/arm64/mm/Makefile
index 60454256945b..2fc8c6dd0407 100644
--- a/arch/arm64/mm/Makefile
+++ b/arch/arm64/mm/Makefile
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
obj-y := dma-mapping.o extable.o fault.o init.o \
cache.o copypage.o flush.o \
- ioremap.o mmap.o pgd.o mmu.o \
+ ioremap.o mmap.o pgd.o mem_encrypt.o mmu.o \
context.o proc.o pageattr.o fixmap.o
obj-$(CONFIG_ARM64_CONTPTE) += contpte.o
obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o