summaryrefslogtreecommitdiffstats
path: root/arch/arm/mm/pabort-v6.S
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-06-25 19:25:02 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-06-30 11:04:59 +0100
commit8b4186160b7894ca4583f702a562856d5d9e9118 (patch)
treed5937a74e6d3f0738c3ba7eb9383acf51202e62d /arch/arm/mm/pabort-v6.S
parentb059bdc39321696fe8f344acb7117d57fbd7b475 (diff)
downloadlinux-8b4186160b7894ca4583f702a562856d5d9e9118.tar.bz2
ARM: entry: prefetch abort helper: pass aborted pc in r4 rather than r0
This avoids unnecessary instructions for CPUs which implement the IFAR (instruction fault address register). Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm/pabort-v6.S')
-rw-r--r--arch/arm/mm/pabort-v6.S3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mm/pabort-v6.S b/arch/arm/mm/pabort-v6.S
index 06e3d1ef2115..eaac1cb7c4cc 100644
--- a/arch/arm/mm/pabort-v6.S
+++ b/arch/arm/mm/pabort-v6.S
@@ -4,7 +4,7 @@
/*
* Function: v6_pabort
*
- * Params : r0 = address of aborted instruction
+ * Params : r4 = address of aborted instruction
*
* Returns : r0 = address of abort
* : r1 = IFSR
@@ -14,6 +14,7 @@
.align 5
ENTRY(v6_pabort)
+ mov r0, r4
mrc p15, 0, r1, c5, c0, 1 @ get IFSR
mov pc, lr
ENDPROC(v6_pabort)