diff options
| author |   Ard Biesheuvel <ardb@kernel.org> | 2022-06-24 17:06:32 +0200 |
|---|---|---|
| committer |   Will Deacon <will@kernel.org> | 2022-06-24 17:18:09 +0100 |
| commit | 0d9b1ffefabee93727bae68201593fac80a79002 (patch) | |
| tree | 8c0b7a0645e617ca07c18f2c5ccde862fdf3c794 /arch/arm64/mm/mmu.c | |
| parent | arm64: head: move kimage_vaddr variable into C file (diff) | |
| download | linux-dev-0d9b1ffefabee93727bae68201593fac80a79002.tar.xz linux-dev-0d9b1ffefabee93727bae68201593fac80a79002.zip | |
arm64: mm: make vabits_actual a build time constant if possible
Currently, we only support 52-bit virtual addressing on 64k pages
configurations, and in all other cases, vabits_actual is guaranteed to
equal VA_BITS (== VA_BITS_MIN). So get rid of the variable entirely in
that case.
While at it, move the assignment out of the asm entry code - it has no
need to be there.
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/r/20220624150651.1358849-3-ardb@kernel.org
Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'arch/arm64/mm/mmu.c')
| -rw-r--r-- | arch/arm64/mm/mmu.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index fde2b326419a..88b4177254a0 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -46,8 +46,10 @@ u64 idmap_t0sz = TCR_T0SZ(VA_BITS_MIN); u64 idmap_ptrs_per_pgd = PTRS_PER_PGD; -u64 __section(".mmuoff.data.write") vabits_actual; +#if VA_BITS > 48 +u64 vabits_actual __ro_after_init = VA_BITS_MIN; EXPORT_SYMBOL(vabits_actual); +#endif u64 kimage_vaddr __ro_after_init = (u64)&_text; EXPORT_SYMBOL(kimage_vaddr); |