BACKPORT: arm64: move kimage_vaddr to .rodata

Clean backport.

This datum is not referenced from .idmap.text: it does not need to be
mapped in idmap. Lets move it to .rodata as it is never written to after
early boot of the primary CPU.
(Maybe .data.ro_after_init would be cleaner though?)

Bug: 352610488
Change-Id: I83bc69358eca7eca1a5e9916bc6fe477f1c6ef96
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
Acked-by: Will Deacon <will@kernel.org>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
(cherry picked from commit 6cf9a2dce6bd10cf454cf6299c1c23182cb486e7)
Signed-off-by: Giuliano Procida <gprocida@google.com>
This commit is contained in:
Remi Denis-Courmont
2020-03-12 11:40:02 +02:00
committed by Giuliano Procida
parent db0d3aeed9
commit 9ace17ce18

View File

@@ -470,17 +470,19 @@ __primary_switched:
b start_kernel
ENDPROC(__primary_switched)
.pushsection ".rodata", "a"
SYM_DATA_START(kimage_vaddr)
.quad _text - TEXT_OFFSET
SYM_DATA_END(kimage_vaddr)
EXPORT_SYMBOL(kimage_vaddr)
.popsection
/*
* end early head section, begin head code that is also used for
* hotplug and needs to have the same protections as the text region
*/
.section ".idmap.text","awx"
SYM_DATA_START(kimage_vaddr)
.quad _text - TEXT_OFFSET
SYM_DATA_END(kimage_vaddr)
EXPORT_SYMBOL(kimage_vaddr)
/*
* If we're fortunate enough to boot at EL2, ensure that the world is
* sane before dropping to EL1.