aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mm/abort-ev7.S
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-06-26 14:42:02 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-07-02 10:56:11 +0100
commit0d147db0c127c561f8f9ead9f3c1ec38f89f1040 (patch)
treeed499217d06bd42fc70bfcd7d3c0ae8ee05bc0b8 /arch/arm/mm/abort-ev7.S
parent3e287bec6fde088bff05ee7f998f53e8ac75b922 (diff)
downloadlinux-stericsson-0d147db0c127c561f8f9ead9f3c1ec38f89f1040.tar.gz
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-ev7.S')
-rw-r--r--arch/arm/mm/abort-ev7.S8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mm/abort-ev7.S b/arch/arm/mm/abort-ev7.S
index 6cb51431a859..6f98b3a17ac7 100644
--- a/arch/arm/mm/abort-ev7.S
+++ b/arch/arm/mm/abort-ev7.S
@@ -41,13 +41,13 @@ ENTRY(v7_early_abort)
mcr p15, 0, r0, c7, c8, 0 @ Retranslate FAR
isb
- mrc p15, 0, r2, c7, c4, 0 @ Read the PAR
- and r3, r2, #0x7b @ On translation fault
+ mrc p15, 0, ip, c7, c4, 0 @ Read the PAR
+ and r3, ip, #0x7b @ On translation fault
cmp r3, #0x0b
movne pc, lr
bic r1, r1, #0xf @ Fix up FSR FS[5:0]
- and r2, r2, #0x7e
- orr r1, r1, r2, LSR #1
+ and ip, ip, #0x7e
+ orr r1, r1, ip, LSR #1
#endif
mov pc, lr