diff options
| author | Patrick Mochel <mochel@osdl.org> | 2002-09-25 01:55:17 -0700 |
|---|---|---|
| committer | Patrick Mochel <mochel@osdl.org> | 2002-09-25 01:55:17 -0700 |
| commit | 56d8b39d50e64ca5f9e20cfcd79870dd4109974f (patch) | |
| tree | af05395acfa2666d48b52ac7a9d5553b82204e6d /kernel | |
| parent | abe2e064d36a5ca7e2697f017c3017709572d26a (diff) | |
| parent | 4a99b33d118d4bfa1d53657303a85daca182683f (diff) | |
Merge bk://ldm@bkbits.net/linux-2.5
into osdl.org:/home/mochel/src/kernel/devel/linux-2.5
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/exit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index fe11fa929746..7189e9bce6d4 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -626,7 +626,7 @@ NORET_TYPE void do_exit(long code) tsk->flags |= PF_EXITING; del_timer_sync(&tsk->real_timer); - if (unlikely(preempt_count())) + if (unlikely(in_atomic())) printk(KERN_INFO "note: %s[%d] exited with preempt_count %d\n", current->comm, current->pid, preempt_count()); |