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 acd875e0cacac3912a0c83a8f6549b343fd79176..5f51057518b04abd45d10d465ee8c5e95abb4254 100644 (file)
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -296,6 +296,7 @@ static void acpi_processor_idle(void)
                smp_mb__after_clear_bit();
                if (need_resched()) {
                        set_thread_flag(TIF_POLLING_NRFLAG);
+                       local_irq_enable();
                        return;
                }
        }