diff options
| author | Jeff Garzik <jgarzik@mandrakesoft.com> | 2002-09-19 14:14:46 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@mandrakesoft.com> | 2002-09-19 14:14:46 -0400 |
| commit | b97490bf7bfd7aafdb17a22329dbf9bde4e71d12 (patch) | |
| tree | cdcaaac9676672df24dccd9062ad1bbe715133b1 /kernel/exit.c | |
| parent | b8f7f3153feacf14b8b7b7068319a9e4d59409d3 (diff) | |
| parent | d103aab67659df7e0f2bb3dbfe3663c3ed318895 (diff) | |
Merge mandrakesoft.com:/home/jgarzik/repo/linus-2.5
into mandrakesoft.com:/home/jgarzik/repo/net-drivers-2.5
Diffstat (limited to 'kernel/exit.c')
| -rw-r--r-- | kernel/exit.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index 6d14cb4d7090..4b051cb290c2 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -610,8 +610,7 @@ NORET_TYPE void do_exit(long code) if (tsk->pid == 1) panic("Attempted to kill init!"); tsk->flags |= PF_EXITING; - if (timer_pending(&tsk->real_timer)) - del_timer_sync(&tsk->real_timer); + del_timer_sync(&tsk->real_timer); if (unlikely(preempt_count())) printk(KERN_INFO "note: %s[%d] exited with preempt_count %d\n", |