diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /include/linux/signal.h | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/signal.h')
| -rw-r--r-- | include/linux/signal.h | 2 |
1 files changed, 0 insertions, 2 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)) |