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>
@@ -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
@@ -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)
* Function: v6_pabort
* : r1 = IFSR
ENTRY(v6_pabort)
mrc p15, 0, r1, c5, c0, 1 @ get IFSR
ENDPROC(v6_pabort)