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 /include/linux/sched.h | |
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 'include/linux/sched.h')
-rw-r--r-- | include/linux/sched.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 3deb6e5d3096..b2d161d87db7 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -460,7 +460,7 @@ struct signal_struct { | |||
460 | 460 | ||
461 | /* ITIMER_REAL timer for the process */ | 461 | /* ITIMER_REAL timer for the process */ |
462 | struct hrtimer real_timer; | 462 | struct hrtimer real_timer; |
463 | struct task_struct *tsk; | 463 | struct pid *leader_pid; |
464 | ktime_t it_real_incr; | 464 | ktime_t it_real_incr; |
465 | 465 | ||
466 | /* ITIMER_PROF and ITIMER_VIRTUAL timers for the process */ | 466 | /* ITIMER_PROF and ITIMER_VIRTUAL timers for the process */ |
@@ -1686,7 +1686,6 @@ extern void block_all_signals(int (*notifier)(void *priv), void *priv, | |||
1686 | extern void unblock_all_signals(void); | 1686 | extern void unblock_all_signals(void); |
1687 | extern void release_task(struct task_struct * p); | 1687 | extern void release_task(struct task_struct * p); |
1688 | extern int send_sig_info(int, struct siginfo *, struct task_struct *); | 1688 | extern int send_sig_info(int, struct siginfo *, struct task_struct *); |
1689 | extern int send_group_sig_info(int, struct siginfo *, struct task_struct *); | ||
1690 | extern int force_sigsegv(int, struct task_struct *); | 1689 | extern int force_sigsegv(int, struct task_struct *); |
1691 | extern int force_sig_info(int, struct siginfo *, struct task_struct *); | 1690 | extern int force_sig_info(int, struct siginfo *, struct task_struct *); |
1692 | extern int __kill_pgrp_info(int sig, struct siginfo *info, struct pid *pgrp); | 1691 | extern int __kill_pgrp_info(int sig, struct siginfo *info, struct pid *pgrp); |