diff options
| author | Christopher Covington <cov@codeaurora.org> | 2014-01-21 10:25:34 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-01-28 09:34:03 -0500 |
| commit | 2ab4e8c06dc084c1bba8c8edfa1b33424c16d336 (patch) | |
| tree | 9c86b51cc956d71886adf0552c1e9bef03cd30f7 /arch | |
| parent | f8fe23ec4e89b58e63085ea92348aff3bcca3e14 (diff) | |
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')
| -rw-r--r-- | arch/arm/kernel/head.S | 3 |
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 @@ | |||
| 52 | .equ swapper_pg_dir, KERNEL_RAM_VADDR - PG_DIR_SIZE | 52 | .equ swapper_pg_dir, KERNEL_RAM_VADDR - PG_DIR_SIZE |
| 53 | 53 | ||
| 54 | .macro pgtbl, rd, phys | 54 | .macro pgtbl, rd, phys |
| 55 | add \rd, \phys, #TEXT_OFFSET - PG_DIR_SIZE | 55 | add \rd, \phys, #TEXT_OFFSET |
| 56 | sub \rd, \rd, #PG_DIR_SIZE | ||
| 56 | .endm | 57 | .endm |
| 57 | 58 | ||
| 58 | /* | 59 | /* |