diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-11-11 14:09:06 -0600 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-11-11 14:09:06 -0600 |
| commit | ca869912366f60cb5e0bdd09f65e80ee6816e73c (patch) | |
| tree | a72913a29495ca078987c09fc0008f47e11b900b /kernel/signal.c | |
| parent | dd8a306ac0c918268bd2ae89da2dea627f6e352d (diff) | |
| parent | 388f7ef720a982f49925e7b4e96f216f208f8c03 (diff) | |
| download | kernel_samsung_tuna-ca869912366f60cb5e0bdd09f65e80ee6816e73c.zip kernel_samsung_tuna-ca869912366f60cb5e0bdd09f65e80ee6816e73c.tar.gz kernel_samsung_tuna-ca869912366f60cb5e0bdd09f65e80ee6816e73c.tar.bz2 | |
Merge with /home/shaggy/git/linus-clean/
Diffstat (limited to 'kernel/signal.c')
| -rw-r--r-- | kernel/signal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index 1bf3c39..80789a5 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -1499,7 +1499,7 @@ void do_notify_parent(struct task_struct *tsk, int sig) psig = tsk->parent->sighand; spin_lock_irqsave(&psig->siglock, flags); - if (sig == SIGCHLD && + if (!tsk->ptrace && sig == SIGCHLD && (psig->action[SIGCHLD-1].sa.sa_handler == SIG_IGN || (psig->action[SIGCHLD-1].sa.sa_flags & SA_NOCLDWAIT))) { /* |