summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/head.S
diff options
context:
space:
mode:
authorChristopher Covington <cov@codeaurora.org>2014-01-21 16:25:34 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-01-28 15:34:03 +0100
commit2ab4e8c06dc084c1bba8c8edfa1b33424c16d336 (patch)
tree9c86b51cc956d71886adf0552c1e9bef03cd30f7 /arch/arm/kernel/head.S
parentARM: 7946/1: asm: __und_usr_thumb need byteswap instructions in BE case (diff)
downloadlinux-2ab4e8c06dc084c1bba8c8edfa1b33424c16d336.tar.xz
linux-2ab4e8c06dc084c1bba8c8edfa1b33424c16d336.zip
ARM: 7947/1: Make pgtbl macro more robust
The pgtbl macro couldn't handle the specific (TEXT_OFFSET - PG_DIR_SIZE) value that the combination of MSM platforms and LPAE created: head.S:163: Error: invalid constant (203000) after fixup Regardless of whether this combination of configuration options will work on currently support platforms at run time, make it at least assemble properly. Signed-off-by: Christopher Covington <cov@codeaurora.org> Reviewed-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/head.S')
-rw-r--r--arch/arm/kernel/head.S3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index 32f317e5828a..914616e0bdcd 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 - PG_DIR_SIZE
+ add \rd, \phys, #TEXT_OFFSET
+ sub \rd, \rd, #PG_DIR_SIZE
.endm
/*