ARM: 8802/1: Call syscall_trace_exit even when system call skipped
[muen/linux.git] / arch / arm / kernel / entry-common.S
index 746565a876dcdd362522d1e546c8404faacfbfe2..0465d65d23de5786ef5df32738d0830ca492353a 100644 (file)
@@ -296,16 +296,15 @@ __sys_trace:
        cmp     scno, #-1                       @ skip the syscall?
        bne     2b
        add     sp, sp, #S_OFF                  @ restore stack
-       b       ret_slow_syscall
 
-__sys_trace_return:
-       str     r0, [sp, #S_R0 + S_OFF]!        @ save returned r0
+__sys_trace_return_nosave:
+       enable_irq_notrace
        mov     r0, sp
        bl      syscall_trace_exit
        b       ret_slow_syscall
 
-__sys_trace_return_nosave:
-       enable_irq_notrace
+__sys_trace_return:
+       str     r0, [sp, #S_R0 + S_OFF]!        @ save returned r0
        mov     r0, sp
        bl      syscall_trace_exit
        b       ret_slow_syscall