summaryrefslogtreecommitdiff
path: root/arch/arm/mm/abort-ev4.S
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-06-26 17:35:07 +0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-07-02 13:56:11 +0400
commit3e287bec6fde088bff05ee7f998f53e8ac75b922 (patch)
tree4ad814de273327ae1e6ddc354ab0ab6bb9653246 /arch/arm/mm/abort-ev4.S
parent8dfe7ac96fedd4f5219879f63a8a546a33609daf (diff)
downloadlinux-3e287bec6fde088bff05ee7f998f53e8ac75b922.tar.xz
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/mm/abort-ev4.S')
-rw-r--r--arch/arm/mm/abort-ev4.S8
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mm/abort-ev4.S b/arch/arm/mm/abort-ev4.S
index 4f18f9e87bae..beb112bdc049 100644
--- a/arch/arm/mm/abort-ev4.S
+++ b/arch/arm/mm/abort-ev4.S
@@ -3,8 +3,8 @@
/*
* Function: v4_early_abort
*
- * Params : r2 = address of aborted instruction
- * : r3 = saved SPSR
+ * Params : r4 = aborted context pc
+ * : r5 = aborted context psr
*
* Returns : r0 = address of abort
* : r1 = FSR, bit 11 = write
@@ -21,10 +21,8 @@
ENTRY(v4_early_abort)
mrc p15, 0, r1, c5, c0, 0 @ get FSR
mrc p15, 0, r0, c6, c0, 0 @ get FAR
- ldr r3, [r2] @ read aborted ARM instruction
+ ldr r3, [r4] @ read aborted ARM instruction
bic r1, r1, #1 << 11 | 1 << 10 @ clear bits 11 and 10 of FSR
tst r3, #1 << 20 @ L = 1 -> write?
orreq r1, r1, #1 << 11 @ yes.
mov pc, lr
-
-