summaryrefslogtreecommitdiffstats
path: root/arch/arm/mm/abort-ev5t.S
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-06-26 15:42:02 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-07-02 11:56:11 +0200
commit0d147db0c127c561f8f9ead9f3c1ec38f89f1040 (patch)
treeed499217d06bd42fc70bfcd7d3c0ae8ee05bc0b8 /arch/arm/mm/abort-ev5t.S
parentARM: entry: data abort: arrange for CPU abort helpers to take pc/psr in r4/r5 (diff)
downloadlinux-0d147db0c127c561f8f9ead9f3c1ec38f89f1040.tar.xz
linux-0d147db0c127c561f8f9ead9f3c1ec38f89f1040.zip
ARM: entry: data abort: avoid using r2 in abort helpers
This allows us to pass the pt_regs pointer in to these functions ready for tail-calling the abort handler. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm/abort-ev5t.S')
-rw-r--r--arch/arm/mm/abort-ev5t.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/abort-ev5t.S b/arch/arm/mm/abort-ev5t.S
index 97eee7c48019..751391a5de59 100644
--- a/arch/arm/mm/abort-ev5t.S
+++ b/arch/arm/mm/abort-ev5t.S
@@ -25,7 +25,7 @@ ENTRY(v5t_early_abort)
do_thumb_abort fsr=r1, pc=r4, psr=r5, tmp=r3
ldreq r3, [r4] @ read aborted ARM instruction
bic r1, r1, #1 << 11 @ clear bits 11 of FSR
- do_ldrd_abort tmp=r2, insn=r3
+ do_ldrd_abort tmp=ip, insn=r3
tst r3, #1 << 20 @ check write
orreq r1, r1, #1 << 11
mov pc, lr