diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/signal.c | 2 | ||||
-rw-r--r-- | kernel/sys.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index 1bf3c39d61..80789a59b4 100644 --- a/kernel/signal.c +++ b/kernel/signal.c | |||
@@ -1499,7 +1499,7 @@ void do_notify_parent(struct task_struct *tsk, int sig) | |||
1499 | 1499 | ||
1500 | psig = tsk->parent->sighand; | 1500 | psig = tsk->parent->sighand; |
1501 | spin_lock_irqsave(&psig->siglock, flags); | 1501 | spin_lock_irqsave(&psig->siglock, flags); |
1502 | if (sig == SIGCHLD && | 1502 | if (!tsk->ptrace && sig == SIGCHLD && |
1503 | (psig->action[SIGCHLD-1].sa.sa_handler == SIG_IGN || | 1503 | (psig->action[SIGCHLD-1].sa.sa_handler == SIG_IGN || |
1504 | (psig->action[SIGCHLD-1].sa.sa_flags & SA_NOCLDWAIT))) { | 1504 | (psig->action[SIGCHLD-1].sa.sa_flags & SA_NOCLDWAIT))) { |
1505 | /* | 1505 | /* |
diff --git a/kernel/sys.c b/kernel/sys.c index c43b3e22bb..bce933ebb2 100644 --- a/kernel/sys.c +++ b/kernel/sys.c | |||
@@ -1497,6 +1497,8 @@ EXPORT_SYMBOL(in_egroup_p); | |||
1497 | 1497 | ||
1498 | DECLARE_RWSEM(uts_sem); | 1498 | DECLARE_RWSEM(uts_sem); |
1499 | 1499 | ||
1500 | EXPORT_SYMBOL(uts_sem); | ||
1501 | |||
1500 | asmlinkage long sys_newuname(struct new_utsname __user * name) | 1502 | asmlinkage long sys_newuname(struct new_utsname __user * name) |
1501 | { | 1503 | { |
1502 | int errno = 0; | 1504 | int errno = 0; |