Commit d103aab6 authored by Linus Torvalds's avatar Linus Torvalds

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

into home.transmeta.com:/home/torvalds/v2.5/linux
parents bb7006cb 3b9f5dcf
......@@ -610,7 +610,6 @@ 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);
if (unlikely(preempt_count()))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment