From: Will Deacon <will@kernel.org>
Date: Fri, 29 Oct 2021 11:24:47 +0000 (+0100)
Subject: Merge branch 'for-next/kexec' into for-next/core
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d8a2c0fba530f318c32e60310bc9df79fa54a14d;p=linux.git

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
---

d8a2c0fba530f318c32e60310bc9df79fa54a14d
diff --cc arch/arm64/kernel/vmlinux.lds.S
index 443f034530362,0760331af85c4..50bab186c49b5
--- a/arch/arm64/kernel/vmlinux.lds.S
+++ b/arch/arm64/kernel/vmlinux.lds.S
@@@ -160,7 -171,9 +171,8 @@@ SECTION
  			HYPERVISOR_TEXT
  			IDMAP_TEXT
  			HIBERNATE_TEXT
+ 			KEXEC_TEXT
  			TRAMP_TEXT
 -			*(.fixup)
  			*(.gnu.warning)
  		. = ALIGN(16);
  		*(.got)			/* Global offset table		*/