aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/kernel/entry-armv.S
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-06-25 15:46:08 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-06-29 10:05:33 +0100
commit0402becef94c43bb2bb483653a5cee2fb5049764 (patch)
tree259d36e5ff5b33e59660b27b2743d723df083543 /arch/arm/kernel/entry-armv.S
parentac8b9c1ce094d43372d0259de08045ffee745a41 (diff)
downloadlinux-0402becef94c43bb2bb483653a5cee2fb5049764.tar.gz
ARM: entry: prefetch/data abort helpers: avoid corrupting r4
Replace r4 with ip for calling abort helpers - ip is allowed to be corrupted by called functions in the ABI, so it makes more sense to use such a register. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/entry-armv.S')
-rw-r--r--arch/arm/kernel/entry-armv.S8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index dbe9eb88d55..6855f6dd72d 100644
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -47,9 +47,9 @@
.macro pabt_helper
mov r0, r2 @ pass address of aborted instruction.
#ifdef MULTI_PABORT
- ldr r4, .LCprocfns
+ ldr ip, .LCprocfns
mov lr, pc
- ldr pc, [r4, #PROCESSOR_PABT_FUNC]
+ ldr pc, [ip, #PROCESSOR_PABT_FUNC]
#else
bl CPU_PABORT_HANDLER
#endif
@@ -67,9 +67,9 @@
@ the fault status register in r1. r9 must be preserved.
@
#ifdef MULTI_DABORT
- ldr r4, .LCprocfns
+ ldr ip, .LCprocfns
mov lr, pc
- ldr pc, [r4, #PROCESSOR_DABT_FUNC]
+ ldr pc, [ip, #PROCESSOR_DABT_FUNC]
#else
bl CPU_DABORT_HANDLER
#endif