| Message ID | 20220613144550.3760857-2-ardb@kernel.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 475031b6ed43d208925c81bea612f48c3259c3c8 |
| Headers | show |
| Series | arm64: refactor boot flow and add support for WXN | expand |
On 6/13/22 20:15, Ard Biesheuvel wrote: > This variable definition does not need to be in head.S so move it out. > > Signed-off-by: Ard Biesheuvel <ardb@kernel.org> Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com> > --- > arch/arm64/kernel/head.S | 7 ------- > arch/arm64/mm/mmu.c | 3 +++ > 2 files changed, 3 insertions(+), 7 deletions(-) > > diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S > index 6a98f1a38c29..1cdecce552bb 100644 > --- a/arch/arm64/kernel/head.S > +++ b/arch/arm64/kernel/head.S > @@ -469,13 +469,6 @@ SYM_FUNC_START_LOCAL(__primary_switched) > ASM_BUG() > SYM_FUNC_END(__primary_switched) > > - .pushsection ".rodata", "a" > -SYM_DATA_START(kimage_vaddr) > - .quad _text > -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 > diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c > index c5563ff990da..7148928e3932 100644 > --- a/arch/arm64/mm/mmu.c > +++ b/arch/arm64/mm/mmu.c > @@ -49,6 +49,9 @@ u64 idmap_ptrs_per_pgd = PTRS_PER_PGD; > u64 __section(".mmuoff.data.write") vabits_actual; > EXPORT_SYMBOL(vabits_actual); > > +u64 kimage_vaddr __ro_after_init = (u64)&_text; > +EXPORT_SYMBOL(kimage_vaddr); > + > u64 kimage_voffset __ro_after_init; > EXPORT_SYMBOL(kimage_voffset); >
diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index 6a98f1a38c29..1cdecce552bb 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -469,13 +469,6 @@ SYM_FUNC_START_LOCAL(__primary_switched) ASM_BUG() SYM_FUNC_END(__primary_switched) - .pushsection ".rodata", "a" -SYM_DATA_START(kimage_vaddr) - .quad _text -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 diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index c5563ff990da..7148928e3932 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -49,6 +49,9 @@ u64 idmap_ptrs_per_pgd = PTRS_PER_PGD; u64 __section(".mmuoff.data.write") vabits_actual; EXPORT_SYMBOL(vabits_actual); +u64 kimage_vaddr __ro_after_init = (u64)&_text; +EXPORT_SYMBOL(kimage_vaddr); + u64 kimage_voffset __ro_after_init; EXPORT_SYMBOL(kimage_voffset);
This variable definition does not need to be in head.S so move it out. Signed-off-by: Ard Biesheuvel <ardb@kernel.org> --- arch/arm64/kernel/head.S | 7 ------- arch/arm64/mm/mmu.c | 3 +++ 2 files changed, 3 insertions(+), 7 deletions(-)