From: Will Deacon <will@kernel.org>
Date: Tue, 13 Aug 2019 16:58:36 +0100
Subject: arm64: memory: Simplify _VA_START and _PAGE_OFFSET definitions
Patch-mainline: v5.4-rc1
Git-commit: a5ac40f53bfa5e43d9c76e3c23415ee4afd71932
References: jsc#SLE-16407
Rather than subtracting from -1 and then adding 1, we can simply
subtract from 0.
Tested-by: Steve Capper <steve.capper@arm.com>
Reviewed-by: Steve Capper <steve.capper@arm.com>
Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will@kernel.org>
Acked-by: Lee, Chun-Yi <jlee@suse.com>
---
arch/arm64/include/asm/memory.h | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
--- a/arch/arm64/include/asm/memory.h
+++ b/arch/arm64/include/asm/memory.h
@@ -44,8 +44,7 @@
* VA_START - the first kernel virtual address.
*/
#define VA_BITS (CONFIG_ARM64_VA_BITS)
-#define _PAGE_OFFSET(va) (UL(0xffffffffffffffff) - \
- (UL(1) << (va)) + 1)
+#define _PAGE_OFFSET(va) (-(UL(1) << (va)))
#define PAGE_OFFSET (_PAGE_OFFSET(VA_BITS))
#define KIMAGE_VADDR (MODULES_END)
#define BPF_JIT_REGION_START (KASAN_SHADOW_END)
@@ -63,8 +62,7 @@
#else
#define VA_BITS_MIN (VA_BITS)
#endif
-#define _VA_START(va) (UL(0xffffffffffffffff) - \
- (UL(1) << ((va) - 1)) + 1)
+#define _VA_START(va) (-(UL(1) << ((va) - 1)))
#define KERNEL_START _text
#define KERNEL_END _end