aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/exit.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel/exit.c b/kernel/exit.c
index b4d569675d4b..28144b94e55c 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -747,13 +747,11 @@ static void exit_notify(struct task_struct *tsk)
747 * Now we'll wake all the threads in the group just to make 747 * Now we'll wake all the threads in the group just to make
748 * sure someone gets all the pending signals. 748 * sure someone gets all the pending signals.
749 */ 749 */
750 read_lock(&tasklist_lock);
751 spin_lock_irq(&tsk->sighand->siglock); 750 spin_lock_irq(&tsk->sighand->siglock);
752 for (t = next_thread(tsk); t != tsk; t = next_thread(t)) 751 for (t = next_thread(tsk); t != tsk; t = next_thread(t))
753 if (!signal_pending(t) && !(t->flags & PF_EXITING)) 752 if (!signal_pending(t) && !(t->flags & PF_EXITING))
754 recalc_sigpending_and_wake(t); 753 recalc_sigpending_and_wake(t);
755 spin_unlock_irq(&tsk->sighand->siglock); 754 spin_unlock_irq(&tsk->sighand->siglock);
756 read_unlock(&tasklist_lock);
757 } 755 }
758 756
759 write_lock_irq(&tasklist_lock); 757 write_lock_irq(&tasklist_lock);
@@ -781,9 +779,8 @@ static void exit_notify(struct task_struct *tsk)
781 * and we were the only connection outside, so our pgrp 779 * and we were the only connection outside, so our pgrp
782 * is about to become orphaned. 780 * is about to become orphaned.
783 */ 781 */
784
785 t = tsk->real_parent; 782 t = tsk->real_parent;
786 783
787 pgrp = task_pgrp(tsk); 784 pgrp = task_pgrp(tsk);
788 if ((task_pgrp(t) != pgrp) && 785 if ((task_pgrp(t) != pgrp) &&
789 (task_session(t) == task_session(tsk)) && 786 (task_session(t) == task_session(tsk)) &&