From: Janusz Krzysztofik Date: Thu, 8 Sep 2011 17:45:40 +0000 (+0100) Subject: ARM: 7088/1: entry: fix wrong parameter name used in do_thumb_abort X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6c6d8deb5d95a0675a8edd588bbc2249cbce5b34;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git 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 Signed-off-by: Russell King --- 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