aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/entry-armv.S
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/kernel/entry-armv.S')
-rw-r--r--arch/arm/kernel/entry-armv.S8
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index b17e57949d3b..af2fba7a4cae 100644
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -45,7 +45,7 @@
45 .endm 45 .endm
46 46
47 .macro pabt_helper 47 .macro pabt_helper
48 @ PABORT handler takes fault address in r4 48 @ PABORT handler takes pt_regs in r2, fault address in r4 and psr in r5
49#ifdef MULTI_PABORT 49#ifdef MULTI_PABORT
50 ldr ip, .LCprocfns 50 ldr ip, .LCprocfns
51 mov lr, pc 51 mov lr, pc
@@ -306,9 +306,8 @@ ENDPROC(__und_svc)
306 .align 5 306 .align 5
307__pabt_svc: 307__pabt_svc:
308 svc_entry 308 svc_entry
309 pabt_helper
310 mov r2, sp @ regs 309 mov r2, sp @ regs
311 bl do_PrefetchAbort @ call abort handler 310 pabt_helper
312 311
313 @ 312 @
314 @ IRQs off again before pulling preserved data off the stack 313 @ IRQs off again before pulling preserved data off the stack
@@ -653,9 +652,8 @@ ENDPROC(__und_usr_unknown)
653 .align 5 652 .align 5
654__pabt_usr: 653__pabt_usr:
655 usr_entry 654 usr_entry
656 pabt_helper
657 mov r2, sp @ regs 655 mov r2, sp @ regs
658 bl do_PrefetchAbort @ call abort handler 656 pabt_helper
659 UNWIND(.fnend ) 657 UNWIND(.fnend )
660 /* fall through */ 658 /* fall through */
661/* 659/*