summaryrefslogtreecommitdiff
path: root/arch/arm/mm/abort-lv4t.S
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-06-27 15:23:11 +0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-07-02 13:56:12 +0400
commit108f6af0a82cf3b61f3ac6728e2241805a935b64 (patch)
treeb7ef30935a4d632131f9b5dbc6085a106fb05cc6 /arch/arm/mm/abort-lv4t.S
parente22c12f9146d50ee6b0cf97db46b3310409f64e6 (diff)
downloadlinux-108f6af0a82cf3b61f3ac6728e2241805a935b64.tar.xz
ARM: entry: data abort: always use r6 for offset
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm/abort-lv4t.S')
-rw-r--r--arch/arm/mm/abort-lv4t.S6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mm/abort-lv4t.S b/arch/arm/mm/abort-lv4t.S
index 921aaab0c8c5..54b6d279371a 100644
--- a/arch/arm/mm/abort-lv4t.S
+++ b/arch/arm/mm/abort-lv4t.S
@@ -102,13 +102,13 @@ ENTRY(v4t_late_abort)
tst r8, #1 << 21 @ check writeback bit
beq do_DataAbort @ no writeback -> no fixup
.data_arm_lateldrpostconst:
- movs r9, r8, lsl #20 @ Get offset
+ movs r6, r8, lsl #20 @ Get offset
beq do_DataAbort @ zero -> no fixup
and r5, r8, #15 << 16 @ Extract 'n' from instruction
ldr r7, [r2, r5, lsr #14] @ Get register 'Rn'
tst r8, #1 << 23 @ Check U bit
- subne r7, r7, r9, lsr #20 @ Undo increment
- addeq r7, r7, r9, lsr #20 @ Undo decrement
+ subne r7, r7, r6, lsr #20 @ Undo increment
+ addeq r7, r7, r6, lsr #20 @ Undo decrement
str r7, [r2, r5, lsr #14] @ Put register 'Rn'
b do_DataAbort