summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-06-26 14:35:07 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-07-02 10:56:11 +0100
commit3e287bec6fde088bff05ee7f998f53e8ac75b922 (patch)
tree4ad814de273327ae1e6ddc354ab0ab6bb9653246 /arch/arm/kernel
parent8dfe7ac96fedd4f5219879f63a8a546a33609daf (diff)
ARM: entry: data abort: arrange for CPU abort helpers to take pc/psr in r4/r5
Re-jig the CPU abort helpers to take the PC/PSR in r4/r5 rather than r2/r3. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel')
-rw-r--r--arch/arm/kernel/entry-armv.S6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index af2fba7a4ca..85298c09325 100644
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -56,14 +56,12 @@
.endm
.macro dabt_helper
- mov r2, r4
- mov r3, r5
@
@ Call the processor-specific abort handler:
@
- @ r2 - aborted context pc
- @ r3 - aborted context cpsr
+ @ r4 - aborted context pc
+ @ r5 - aborted context psr
@
@ The abort handler must return the aborted address in r0, and
@ the fault status register in r1. r9 must be preserved.