5 files changed, 22 insertions, 66 deletions

diff --git a/arch/m68knommu/kernel/entry.S b/arch/m68knommu/kernel/entry.S
index aff6f57ef8b5..2783f25e38bd 100644
--- a/arch/m68knommu/kernel/entry.S
+++ b/arch/m68knommu/kernel/entry.S
@@ -112,22 +112,6 @@ ENTRY(sys_clone)
         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
diff --git a/arch/m68knommu/kernel/signal.c b/arch/m68knommu/kernel/signal.c
index 1934de7aaf6c..c973230dad82 100644
--- a/arch/m68knommu/kernel/signal.c
+++ b/arch/m68knommu/kernel/signal.c
@@ -53,60 +53,25 @@
 
 void ret_from_user_signal(void);
 void ret_from_user_rt_signal(void);
-asmlinkage int do_signal(sigset_t *oldset, struct pt_regs *regs);
 
 /*
  * Atomically swap in the new signal mask, and wait for a signal.
  */
-asmlinkage int do_sigsuspend(struct pt_regs *regs)
+asmlinkage int
+sys_sigsuspend(int unused0, int unused1, old_sigset_t mask)
 {
-        old_sigset_t mask = regs->d3;
-        sigset_t saveset;
-
         mask &= _BLOCKABLE;
         spin_lock_irq(&current->sighand->siglock);
-        saveset = current->blocked;
+        current->saved_sigmask = current->blocked;
         siginitset(&current->blocked, mask);
         recalc_sigpending();
         spin_unlock_irq(&current->sighand->siglock);
 
-        regs->d0 = -EINTR;
-        while (1) {
-                current->state = TASK_INTERRUPTIBLE;
-                schedule();
-                if (do_signal(&saveset, regs))
-                        return -EINTR;
-        }
-}
-
-asmlinkage int
-do_rt_sigsuspend(struct pt_regs *regs)
-{
-        sigset_t *unewset = (sigset_t *)regs->d1;
-        size_t sigsetsize = (size_t)regs->d2;
-        sigset_t saveset, newset;
-
-        /* XXX: Don't preclude handling different sized sigset_t's.  */
-        if (sigsetsize != sizeof(sigset_t))
-                return -EINVAL;
-
-        if (copy_from_user(&newset, unewset, sizeof(newset)))
-                return -EFAULT;
-        sigdelsetmask(&newset, ~_BLOCKABLE);
+        current->state = TASK_INTERRUPTIBLE;
+        schedule();
+        set_restore_sigmask();
 
-        spin_lock_irq(&current->sighand->siglock);
-        saveset = current->blocked;
-        current->blocked = newset;
-        recalc_sigpending();
-        spin_unlock_irq(&current->sighand->siglock);
-
-        regs->d0 = -EINTR;
-        while (1) {
-                current->state = TASK_INTERRUPTIBLE;
-                schedule();
-                if (do_signal(&saveset, regs))
-                        return -EINTR;
-        }
+        return -ERESTARTNOHAND;
 }
 
 asmlinkage int 
@@ -752,11 +717,12 @@ handle_signal(int sig, struct k_sigaction *ka, siginfo_t *info,
  * want to handle. Thus you cannot kill init even with a SIGKILL even by
  * mistake.
  */
-asmlinkage int do_signal(sigset_t *oldset, struct pt_regs *regs)
+asmlinkage int do_signal(struct pt_regs *regs)
 {
         struct k_sigaction ka;
         siginfo_t info;
         int signr;
+        sigset_t *oldset;
 
         /*
          * We want the common case to go fast, which
@@ -767,13 +733,16 @@ asmlinkage int do_signal(sigset_t *oldset, struct pt_regs *regs)
         if (!user_mode(regs))
                 return 1;
 
-        if (!oldset)
+        if (test_thread_flag(TIF_RESTORE_SIGMASK))
+                oldset = &current->saved_sigmask;
+        else
                 oldset = &current->blocked;
 
         signr = get_signal_to_deliver(&info, &ka, regs, NULL);
         if (signr > 0) {
                 /* Whee!  Actually deliver the signal.  */
                 handle_signal(signr, &ka, &info, oldset, regs);
+                clear_thread_flag(TIF_RESTORE_SIGMASK);
                 return 1;
         }
 
@@ -782,5 +751,11 @@ asmlinkage int do_signal(sigset_t *oldset, struct pt_regs *regs)
                 /* Restart the system call - no handlers present */
                 handle_restart(regs, NULL, 0);
         }
+
+        /* If there's no signal to deliver, we just restore the saved mask.  */
+        if (test_thread_flag(TIF_RESTORE_SIGMASK)) {
+                clear_thread_flag(TIF_RESTORE_SIGMASK);
+                sigprocmask(SIG_SETMASK, &current->saved_sigmask, NULL);
+        }
         return 0;
 }
diff --git a/arch/m68knommu/platform/68328/entry.S b/arch/m68knommu/platform/68328/entry.S
index 27241e16a526..6eeb635fab7e 100644
--- a/arch/m68knommu/platform/68328/entry.S
+++ b/arch/m68knommu/platform/68328/entry.S
@@ -120,9 +120,8 @@ Lsignal_return:
         subql   #4,%sp                  /* dummy return address*/
         SAVE_SWITCH_STACK
         pea     %sp@(SWITCH_STACK_SIZE)
-        clrl    %sp@-
         bsrw    do_signal
-        addql   #8,%sp
+        addql   #4,%sp
         RESTORE_SWITCH_STACK
         addql   #4,%sp
 Lreturn:
diff --git a/arch/m68knommu/platform/68360/entry.S b/arch/m68knommu/platform/68360/entry.S
index c131c6e1d92d..2a671da4af6f 100644
--- a/arch/m68knommu/platform/68360/entry.S
+++ b/arch/m68knommu/platform/68360/entry.S
@@ -116,9 +116,8 @@ Lsignal_return:
         subql   #4,%sp                  /* dummy return address*/
         SAVE_SWITCH_STACK
         pea     %sp@(SWITCH_STACK_SIZE)
-        clrl    %sp@-
         bsrw    do_signal
-        addql   #8,%sp
+        addql   #4,%sp
         RESTORE_SWITCH_STACK
         addql   #4,%sp
 Lreturn:
diff --git a/arch/m68knommu/platform/coldfire/entry.S b/arch/m68knommu/platform/coldfire/entry.S
index 5e92bed94b7e..ed2878829dbd 100644
--- a/arch/m68knommu/platform/coldfire/entry.S
+++ b/arch/m68knommu/platform/coldfire/entry.S
@@ -167,9 +167,8 @@ Lsignal_return:
         subql   #4,%sp                  /* dummy return address */
         SAVE_SWITCH_STACK
         pea     %sp@(SWITCH_STACK_SIZE)
-        clrl    %sp@-
         jsr     do_signal
-        addql   #8,%sp
+        addql   #4,%sp
         RESTORE_SWITCH_STACK
         addql   #4,%sp
         jmp     Lreturn