diff options
| author | Will Deacon <will@kernel.org> | 2021-10-29 12:24:47 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2021-10-29 12:24:47 +0100 |
| commit | d8a2c0fba530f318c32e60310bc9df79fa54a14d (patch) | |
| tree | b284c8c13fb8bc5e4e51bccdf61b277a087eab53 /arch/arm64/mm/Makefile | |
| parent | 99fe09c857c69be504ae43d6a417d21eafcc6cfb (diff) | |
| parent | 6091dd9eaf8e77311548b616281c1a9c67e6ca40 (diff) | |
| download | linux-d8a2c0fba530f318c32e60310bc9df79fa54a14d.tar.gz linux-d8a2c0fba530f318c32e60310bc9df79fa54a14d.tar.bz2 linux-d8a2c0fba530f318c32e60310bc9df79fa54a14d.zip | |
Merge branch 'for-next/kexec' into for-next/core
* for-next/kexec:
arm64: trans_pgd: remove trans_pgd_map_page()
arm64: kexec: remove cpu-reset.h
arm64: kexec: remove the pre-kexec PoC maintenance
arm64: kexec: keep MMU enabled during kexec relocation
arm64: kexec: install a copy of the linear-map
arm64: kexec: use ld script for relocation function
arm64: kexec: relocate in EL1 mode
arm64: kexec: configure EL2 vectors for kexec
arm64: kexec: pass kimage as the only argument to relocation function
arm64: kexec: Use dcache ops macros instead of open-coding
arm64: kexec: skip relocation code for inplace kexec
arm64: kexec: flush image and lists during kexec load time
arm64: hibernate: abstract ttrb0 setup function
arm64: trans_pgd: hibernate: Add trans_pgd_copy_el2_vectors
arm64: kernel: add helper for booted at EL2 and not VHE
Diffstat (limited to 'arch/arm64/mm/Makefile')
| -rw-r--r-- | arch/arm64/mm/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/mm/Makefile b/arch/arm64/mm/Makefile index f188c9092696..ff1e800ba7a1 100644 --- a/arch/arm64/mm/Makefile +++ b/arch/arm64/mm/Makefile @@ -7,6 +7,7 @@ obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o obj-$(CONFIG_PTDUMP_CORE) += ptdump.o obj-$(CONFIG_PTDUMP_DEBUGFS) += ptdump_debugfs.o obj-$(CONFIG_TRANS_TABLE) += trans_pgd.o +obj-$(CONFIG_TRANS_TABLE) += trans_pgd-asm.o obj-$(CONFIG_DEBUG_VIRTUAL) += physaddr.o obj-$(CONFIG_ARM64_MTE) += mteswap.o KASAN_SANITIZE_physaddr.o += n |