summaryrefslogtreecommitdiffstats
path: root/arch/arm64/kernel
diff options
context:
space:
mode:
authorSteve Capper <steve.capper@arm.com>2019-08-07 16:55:23 +0100
committerWill Deacon <will@kernel.org>2019-08-09 11:17:27 +0100
commit2c624fe68715e76eba1a7089f91e122310dc663c (patch)
tree8e7baf645975ea9c609c47d6e4e5a1f28cac4001 /arch/arm64/kernel
parentb6d00d47e81a49f6cf462518c10408f37a3e6785 (diff)
downloadlinux-2c624fe68715e76eba1a7089f91e122310dc663c.tar.bz2
arm64: mm: Remove vabits_user
Previous patches have enabled 52-bit kernel + user VAs and there is no longer any scenario where user VA != kernel VA size. This patch removes the, now redundant, vabits_user variable and replaces usage with vabits_actual where appropriate. Reviewed-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Steve Capper <steve.capper@arm.com> Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'arch/arm64/kernel')
-rw-r--r--arch/arm64/kernel/head.S7
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S
index c8446f8c81f5..949b001a73bb 100644
--- a/arch/arm64/kernel/head.S
+++ b/arch/arm64/kernel/head.S
@@ -316,11 +316,6 @@ __create_page_tables:
#endif
mov x5, #VA_BITS_MIN
1:
- adr_l x6, vabits_user
- str x5, [x6]
- dmb sy
- dc ivac, x6 // Invalidate potentially stale cache line
-
adr_l x6, vabits_actual
str x5, [x6]
dmb sy
@@ -795,7 +790,7 @@ ENDPROC(__enable_mmu)
ENTRY(__cpu_secondary_check52bitva)
#ifdef CONFIG_ARM64_VA_BITS_52
- ldr_l x0, vabits_user
+ ldr_l x0, vabits_actual
cmp x0, #52
b.ne 2f