diff --git a/[refs] b/[refs] index 18d02e9e4af6..dc43c448a9fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 08d2c30ce98d274137f12b0a9b9c74137455922c +refs/heads/master: db51aeccd7097ce19a522a4c5ff91c320f870e2b diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c index 068ffe007529..2bb675af4de3 100644 --- a/trunk/kernel/fork.c +++ b/trunk/kernel/fork.c @@ -892,7 +892,7 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk) sig->group_exit_code = 0; sig->group_exit_task = NULL; sig->group_stop_count = 0; - sig->curr_target = NULL; + sig->curr_target = tsk; init_sigpending(&sig->shared_pending); INIT_LIST_HEAD(&sig->posix_timers); diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c index 17859f0d8411..0298bd3d431b 100644 --- a/trunk/kernel/signal.c +++ b/trunk/kernel/signal.c @@ -863,10 +863,6 @@ __group_complete_signal(int sig, struct task_struct *p) * Otherwise try to find a suitable thread. */ t = signal->curr_target; - if (t == NULL) - /* restart balancing at this thread */ - t = signal->curr_target = p; - while (!wants_signal(sig, t)) { t = next_thread(t); if (t == signal->curr_target)