Merge bk://linuxusb.bkbits.net/pci_hp-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux

Merge bk://linuxusb.bkbits.net/pci_hp-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
d103aab6 · Linus Torvalds · bb7006cb · 3b9f5dcf · d103aab6
Commit d103aab6 authored Sep 19, 2002 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

kernel/exit.c kernel/exit.c +1 -2

No files found.
--- 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",