diff options
author | Steve Capper <steve.capper@arm.com> | 2019-08-07 17:55:23 +0200 |
---|---|---|
committer | Will Deacon <will@kernel.org> | 2019-08-09 12:17:27 +0200 |
commit | 2c624fe68715e76eba1a7089f91e122310dc663c (patch) | |
tree | 8e7baf645975ea9c609c47d6e4e5a1f28cac4001 /arch/arm64/include/asm/pointer_auth.h | |
parent | arm64: mm: Introduce 52-bit Kernel VAs (diff) | |
download | linux-2c624fe68715e76eba1a7089f91e122310dc663c.tar.xz linux-2c624fe68715e76eba1a7089f91e122310dc663c.zip |
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/include/asm/pointer_auth.h')
-rw-r--r-- | arch/arm64/include/asm/pointer_auth.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/pointer_auth.h b/arch/arm64/include/asm/pointer_auth.h index d328540cb85e..7a24bad1a58b 100644 --- a/arch/arm64/include/asm/pointer_auth.h +++ b/arch/arm64/include/asm/pointer_auth.h @@ -69,7 +69,7 @@ extern int ptrauth_prctl_reset_keys(struct task_struct *tsk, unsigned long arg); * The EL0 pointer bits used by a pointer authentication code. * This is dependent on TBI0 being enabled, or bits 63:56 would also apply. */ -#define ptrauth_user_pac_mask() GENMASK(54, vabits_user) +#define ptrauth_user_pac_mask() GENMASK(54, vabits_actual) /* Only valid for EL0 TTBR0 instruction pointers */ static inline unsigned long ptrauth_strip_insn_pac(unsigned long ptr) |