From c71894c3cfd4079f140a3e7cf5861a50e46f8024 Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Wed, 18 Mar 2020 11:49:22 +0800 Subject: [PATCH] ARM: Make pgtbl macro more robust arch/arm/kernel/head.S:181: Error: invalid constant (608000) after fixup Change-Id: I883614c9f413227240f32ac0b12f418365dbcfe1 Signed-off-by: Tao Huang --- arch/arm/kernel/head.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index 6b1148cafffd..4f9f657697f4 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S @@ -52,7 +52,8 @@ .equ swapper_pg_dir, KERNEL_RAM_VADDR - PG_DIR_SIZE .macro pgtbl, rd, phys - add \rd, \phys, #TEXT_OFFSET + add \rd, \phys, #(TEXT_OFFSET & 0xffff0000) + add \rd, \rd, #(TEXT_OFFSET & 0x0000ffff) sub \rd, \rd, #PG_DIR_SIZE .endm