Re: [PATCH v5 01/21] arm64: head: move kimage_vaddr variable into C file

Mark Rutland
2022-06-26T09:23:38Z

On Fri, Jun 24, 2022 at 05:06:31PM +0200, 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>

Nice!

Acked-by: Mark Rutland <mar.rutland@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);
>
> --
> 2.35.1
>