genirq: Make warning in handle_percpu_event useful

[deliverable/linux.git] / kernel / softirq.c

diff --git a/kernel/softirq.c b/kernel/softirq.c
index 68eb5efec388759b95fa9842576b4f0448fbd195..c0490464e92f04630fc84a071f39a4303842be09 100644 (file)
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -738,7 +738,10 @@ static int run_ksoftirqd(void * __bind_cpu)
                           don't process */
                        if (cpu_is_offline((long)__bind_cpu))
                                goto wait_to_die;
-                       do_softirq();
+                       local_irq_disable();
+                       if (local_softirq_pending())
+                               __do_softirq();
+                       local_irq_enable();
                        preempt_enable_no_resched();
                        cond_resched();
                        preempt_disable();