diff options
| author | Janusz Krzysztofik <jkrzyszt@tis.icnet.pl> | 2011-09-08 19:45:40 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-11 00:39:56 +0200 |
| commit | 6c6d8deb5d95a0675a8edd588bbc2249cbce5b34 (patch) | |
| tree | 2fcfee6741c20e5faf40aeda121361785748b273 /arch | |
| parent | ARM: 7080/1: l2x0: make sure I&D are not locked down on init (diff) | |
| download | linux-6c6d8deb5d95a0675a8edd588bbc2249cbce5b34.tar.xz linux-6c6d8deb5d95a0675a8edd588bbc2249cbce5b34.zip | |
ARM: 7088/1: entry: fix wrong parameter name used in do_thumb_abort
Commit be020f8618ca, "ARM: entry: abort-macro: specify registers to be
used for macros", while replacing register numbers with macro parameter
names, mismatched the name used for r1. For me, this resulted in user
space built for EABI with -march=armv4t -mtune=arm920t -mthumb-interwork
-mthumb broken on my OMAP1510 based Amstrad Delta (old ABI and no thumb
still worked for me though).
Fix this by using correct parameter name fsr instead of mismatched psr,
used by callers for another purpose.
Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mm/abort-macro.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/abort-macro.S b/arch/arm/mm/abort-macro.S index 52162d59407a..2cbf68ef0e83 100644 --- a/arch/arm/mm/abort-macro.S +++ b/arch/arm/mm/abort-macro.S @@ -17,7 +17,7 @@ cmp \tmp, # 0x5600 @ Is it ldrsb? orreq \tmp, \tmp, #1 << 11 @ Set L-bit if yes tst \tmp, #1 << 11 @ L = 0 -> write - orreq \psr, \psr, #1 << 11 @ yes. + orreq \fsr, \fsr, #1 << 11 @ yes. b do_DataAbort not_thumb: .endm |