diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/fork.c | 2 | ||||
-rw-r--r-- | kernel/signal.c | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index 068ffe007529..2bb675af4de3 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
@@ -892,7 +892,7 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk) | |||
892 | sig->group_exit_code = 0; | 892 | sig->group_exit_code = 0; |
893 | sig->group_exit_task = NULL; | 893 | sig->group_exit_task = NULL; |
894 | sig->group_stop_count = 0; | 894 | sig->group_stop_count = 0; |
895 | sig->curr_target = NULL; | 895 | sig->curr_target = tsk; |
896 | init_sigpending(&sig->shared_pending); | 896 | init_sigpending(&sig->shared_pending); |
897 | INIT_LIST_HEAD(&sig->posix_timers); | 897 | INIT_LIST_HEAD(&sig->posix_timers); |
898 | 898 | ||
diff --git a/kernel/signal.c b/kernel/signal.c index 17859f0d8411..0298bd3d431b 100644 --- a/kernel/signal.c +++ b/kernel/signal.c | |||
@@ -863,10 +863,6 @@ __group_complete_signal(int sig, struct task_struct *p) | |||
863 | * Otherwise try to find a suitable thread. | 863 | * Otherwise try to find a suitable thread. |
864 | */ | 864 | */ |
865 | t = signal->curr_target; | 865 | t = signal->curr_target; |
866 | if (t == NULL) | ||
867 | /* restart balancing at this thread */ | ||
868 | t = signal->curr_target = p; | ||
869 | |||
870 | while (!wants_signal(sig, t)) { | 866 | while (!wants_signal(sig, t)) { |
871 | t = next_thread(t); | 867 | t = next_thread(t); |
872 | if (t == signal->curr_target) | 868 | if (t == signal->curr_target) |