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>

diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index 582bb2310446308b69c678d895c56d298e7a6319..d644d0240ad33b49cc7a21014f38e0d076178448 100644 (file)
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -45,7 +45,7 @@
        .endm
 
        .macro  pabt_helper
-       mov     r0, r4                  @ pass address of aborted instruction.
+       @ PABORT handler takes fault address in r4
 #ifdef MULTI_PABORT
        ldr     ip, .LCprocfns
        mov     lr, pc

diff --git a/arch/arm/mm/pabort-legacy.S b/arch/arm/mm/pabort-legacy.S
index 87970eba88ea2fe8f54c29fe2caf05b1b846f4e3..8a5d8aaf2d5ed88f027fafef8f5a1721644761ba 100644 (file)
--- a/arch/arm/mm/pabort-legacy.S
+++ b/arch/arm/mm/pabort-legacy.S
@@ -4,7 +4,7 @@
 /*
  * Function: legacy_pabort
  *
- * Params  : r0 = address of aborted instruction
+ * Params  : r4 = address of aborted instruction
  *
  * Returns : r0 = address of abort
  *        : r1 = Simulated IFSR with section translation fault status
@@ -14,6 +14,7 @@
 
        .align  5
 ENTRY(legacy_pabort)
+       mov     r0, r4
        mov     r1, #5
        mov     pc, lr
 ENDPROC(legacy_pabort)

diff --git a/arch/arm/mm/pabort-v6.S b/arch/arm/mm/pabort-v6.S
index 06e3d1ef2115a04b6695ca1cc7276fff41088079..eaac1cb7c4cc4ceea1375b531f048d6b8218e92b 100644 (file)
--- 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)

diff --git a/arch/arm/mm/pabort-v7.S b/arch/arm/mm/pabort-v7.S
index a8b3b300a18dd88055582cba24441ba6f8f4ce97..b515e0b059b327fbf22d9572fcc96c18ec6deeec 100644 (file)
--- a/arch/arm/mm/pabort-v7.S
+++ b/arch/arm/mm/pabort-v7.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