diff options
-rw-r--r-- | include/linux/signal.h | 2 | ||||
-rw-r--r-- | kernel/signal.c | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/include/linux/signal.h b/include/linux/signal.h index 42d2e0a948f4..84f997f8aa53 100644 --- a/include/linux/signal.h +++ b/include/linux/signal.h | |||
@@ -362,8 +362,6 @@ int unhandled_signal(struct task_struct *tsk, int sig); | |||
362 | #define sig_kernel_stop(sig) \ | 362 | #define sig_kernel_stop(sig) \ |
363 | (((sig) < SIGRTMIN) && siginmask(sig, SIG_KERNEL_STOP_MASK)) | 363 | (((sig) < SIGRTMIN) && siginmask(sig, SIG_KERNEL_STOP_MASK)) |
364 | 364 | ||
365 | #define sig_needs_tasklist(sig) ((sig) == SIGCONT) | ||
366 | |||
367 | #define sig_user_defined(t, signr) \ | 365 | #define sig_user_defined(t, signr) \ |
368 | (((t)->sighand->action[(signr)-1].sa.sa_handler != SIG_DFL) && \ | 366 | (((t)->sighand->action[(signr)-1].sa.sa_handler != SIG_DFL) && \ |
369 | ((t)->sighand->action[(signr)-1].sa.sa_handler != SIG_IGN)) | 367 | ((t)->sighand->action[(signr)-1].sa.sa_handler != SIG_IGN)) |
diff --git a/kernel/signal.c b/kernel/signal.c index 115c04f3f143..ce53ab19c21d 100644 --- a/kernel/signal.c +++ b/kernel/signal.c | |||
@@ -1039,9 +1039,6 @@ int kill_pid_info(int sig, struct siginfo *info, struct pid *pid) | |||
1039 | struct task_struct *p; | 1039 | struct task_struct *p; |
1040 | 1040 | ||
1041 | rcu_read_lock(); | 1041 | rcu_read_lock(); |
1042 | if (unlikely(sig_needs_tasklist(sig))) | ||
1043 | read_lock(&tasklist_lock); | ||
1044 | |||
1045 | retry: | 1042 | retry: |
1046 | p = pid_task(pid, PIDTYPE_PID); | 1043 | p = pid_task(pid, PIDTYPE_PID); |
1047 | if (p) { | 1044 | if (p) { |
@@ -1055,10 +1052,8 @@ retry: | |||
1055 | */ | 1052 | */ |
1056 | goto retry; | 1053 | goto retry; |
1057 | } | 1054 | } |
1058 | |||
1059 | if (unlikely(sig_needs_tasklist(sig))) | ||
1060 | read_unlock(&tasklist_lock); | ||
1061 | rcu_read_unlock(); | 1055 | rcu_read_unlock(); |
1056 | |||
1062 | return error; | 1057 | return error; |
1063 | } | 1058 | } |
1064 | 1059 | ||