| commit | b3c6aeb3ce26b286769d2deafec47d218c83dd09 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Fri Dec 02 23:09:38 2005 -0800 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Fri Dec 02 23:09:38 2005 -0800 |
| tree | 06378a021f5873003a07f0388aa0cb6e81a32c19 | |
| parent | af2eb17bac41a116b73d85b3fb160405c32bea5b [diff] | |
| parent | af1afe866297448ad8a1da99fa8a6af86c43c909 [diff] |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index acd875e..5f51057 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c
@@ -296,6 +296,7 @@ smp_mb__after_clear_bit(); if (need_resched()) { set_thread_flag(TIF_POLLING_NRFLAG); + local_irq_enable(); return; } }