1 files changed, 4 insertions, 20 deletions

diff --git a/kernel/signal.c b/kernel/signal.c
index 792952381092..2124ffadcfde 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -909,8 +909,7 @@ __group_complete_signal(int sig, struct task_struct *p)
                         do {
                                 sigaddset(&t->pending.signal, SIGKILL);
                                 signal_wake_up(t, 1);
-                                t = next_thread(t);
-                        } while (t != p);
+                        } while_each_thread(p, t);
                         return;
                 }
 
@@ -928,13 +927,11 @@ __group_complete_signal(int sig, struct task_struct *p)
                 rm_from_queue(SIG_KERNEL_STOP_MASK, &p->signal->shared_pending);
                 p->signal->group_stop_count = 0;
                 p->signal->group_exit_task = t;
-                t = p;
+                p = t;
                 do {
                         p->signal->group_stop_count++;
-                        signal_wake_up(t, 0);
-                        t = next_thread(t);
-                } while (t != p);
-                wake_up_process(p->signal->group_exit_task);
+                        signal_wake_up(t, t == p);
+                } while_each_thread(p, t);
                 return;
         }
 
@@ -985,9 +982,6 @@ void zap_other_threads(struct task_struct *p)
         p->signal->flags = SIGNAL_GROUP_EXIT;
         p->signal->group_stop_count = 0;
 
-        if (thread_group_empty(p))
-                return;
-
         for (t = next_thread(p); t != p; t = next_thread(t)) {
                 /*
                  * Don't bother with already dead threads
@@ -2300,15 +2294,6 @@ int do_sigaction(int sig, struct k_sigaction *act, struct k_sigaction *oact)
         k = &current->sighand->action[sig-1];
 
         spin_lock_irq(&current->sighand->siglock);
-        if (signal_pending(current)) {
-                /*
-                 * If there might be a fatal signal pending on multiple
-                 * threads, make sure we take it before changing the action.
-                 */
-                spin_unlock_irq(&current->sighand->siglock);
-                return -ERESTARTNOINTR;
-        }
-
         if (oact)
                 *oact = *k;
 
@@ -2335,7 +2320,6 @@ int do_sigaction(int sig, struct k_sigaction *act, struct k_sigaction *oact)
                         rm_from_queue_full(&mask, &t->signal->shared_pending);
                         do {
                                 rm_from_queue_full(&mask, &t->pending);
-                                recalc_sigpending_and_wake(t);
                                 t = next_thread(t);
                         } while (t != current);
                 }