diff options
author | Oleg Nesterov <oleg@tv-sign.ru> | 2008-02-08 07:19:19 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 12:22:29 -0500 |
commit | fea9d175545b38cb3e84569400419eb81bc90fa3 (patch) | |
tree | 0d43fe9ed2ea6104ee8b15a3eb8da081dd08fd35 /kernel/fork.c | |
parent | 46f382d2b69d2221086b823f0dbc8f32c027cac2 (diff) |
ITIMER_REAL: convert to use struct pid
signal_struct->tsk points to the ->group_leader and thus we have the nasty
code in de_thread() which has to change it and restart ->real_timer if the
leader is changed.
Use "struct pid *leader_pid" instead. This also allows us to kill now
unneeded send_group_sig_info().
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Acked-by: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Davide Libenzi <davidel@xmailserver.org>
Cc: Pavel Emelyanov <xemul@openvz.org>
Acked-by: Roland McGrath <roland@redhat.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/fork.c')
-rw-r--r-- | kernel/fork.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index b2ef8e4fad70..ca54d9704644 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
@@ -909,7 +909,6 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk) | |||
909 | hrtimer_init(&sig->real_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); | 909 | hrtimer_init(&sig->real_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); |
910 | sig->it_real_incr.tv64 = 0; | 910 | sig->it_real_incr.tv64 = 0; |
911 | sig->real_timer.function = it_real_fn; | 911 | sig->real_timer.function = it_real_fn; |
912 | sig->tsk = tsk; | ||
913 | 912 | ||
914 | sig->it_virt_expires = cputime_zero; | 913 | sig->it_virt_expires = cputime_zero; |
915 | sig->it_virt_incr = cputime_zero; | 914 | sig->it_virt_incr = cputime_zero; |
@@ -1338,6 +1337,7 @@ static struct task_struct *copy_process(unsigned long clone_flags, | |||
1338 | if (clone_flags & CLONE_NEWPID) | 1337 | if (clone_flags & CLONE_NEWPID) |
1339 | p->nsproxy->pid_ns->child_reaper = p; | 1338 | p->nsproxy->pid_ns->child_reaper = p; |
1340 | 1339 | ||
1340 | p->signal->leader_pid = pid; | ||
1341 | p->signal->tty = current->signal->tty; | 1341 | p->signal->tty = current->signal->tty; |
1342 | set_task_pgrp(p, task_pgrp_nr(current)); | 1342 | set_task_pgrp(p, task_pgrp_nr(current)); |
1343 | set_task_session(p, task_session_nr(current)); | 1343 | set_task_session(p, task_session_nr(current)); |