diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-09-19 03:59:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-09-19 03:59:28 -0700 |
| commit | d103aab67659df7e0f2bb3dbfe3663c3ed318895 (patch) | |
| tree | 5ec871638ddf93d9355ff49f86c7841b6691911b /kernel/exit.c | |
| parent | bb7006cb5c6c81941ab2f33414b4cbfe8e74dfc5 (diff) | |
| parent | 3b9f5dcf65412063b8e5cc249ff1d888b07b8d8e (diff) | |
Merge bk://linuxusb.bkbits.net/pci_hp-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
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", |