Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / m68k / kernel / entry.S

diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S
index 6360c437dcf51c5491e192151b95ce6c1a6923a2..1559dea36e5581f62bf2d8b4b1fe6c6da37308f4 100644 (file)
--- a/arch/m68k/kernel/entry.S
+++ b/arch/m68k/kernel/entry.S
@@ -99,7 +99,10 @@ do_trace_exit:
        jra     .Lret_from_exception
 
 ENTRY(ret_from_signal)
-       RESTORE_SWITCH_STACK
+       tstb    %curptr@(TASK_INFO+TINFO_FLAGS+2)
+       jge     1f
+       jbsr    syscall_trace
+1:     RESTORE_SWITCH_STACK
        addql   #4,%sp
 /* on 68040 complete pending writebacks if any */
 #ifdef CONFIG_M68040
@@ -174,16 +177,11 @@ do_signal_return:
        subql   #4,%sp                  | dummy return address
        SAVE_SWITCH_STACK
        pea     %sp@(SWITCH_STACK_SIZE)
-       clrl    %sp@-
        bsrl    do_signal
-       addql   #8,%sp
+       addql   #4,%sp
        RESTORE_SWITCH_STACK
        addql   #4,%sp
-       tstl    %d0
-       jeq     resume_userspace
-       | when single stepping into handler stop at the first insn
-       btst    #6,%curptr@(TASK_INFO+TINFO_FLAGS+2)
-       jeq     resume_userspace
+       jbra    resume_userspace
 
 do_delayed_trace:
        bclr    #7,%sp@(PT_OFF_SR)      | clear trace bit in SR
@@ -290,22 +288,6 @@ ENTRY(sys_vfork)
        RESTORE_SWITCH_STACK
        rts
 
-ENTRY(sys_sigsuspend)
-       SAVE_SWITCH_STACK
-       pea     %sp@(SWITCH_STACK_SIZE)
-       jbsr    do_sigsuspend
-       addql   #4,%sp
-       RESTORE_SWITCH_STACK
-       rts
-
-ENTRY(sys_rt_sigsuspend)
-       SAVE_SWITCH_STACK
-       pea     %sp@(SWITCH_STACK_SIZE)
-       jbsr    do_rt_sigsuspend
-       addql   #4,%sp
-       RESTORE_SWITCH_STACK
-       rts
-
 ENTRY(sys_sigreturn)
        SAVE_SWITCH_STACK
        jbsr    do_sigreturn