Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

[linux.git] / kernel / smp.c

diff --git a/kernel/smp.c b/kernel/smp.c
index 1b6070bf97bb01f76cea0a7a51bee0c59f3c15ec..aeb0adfa060637fbbef23bebcf15e26c93bd046e 100644 (file)
--- a/kernel/smp.c
+++ b/kernel/smp.c
@@ -14,6 +14,7 @@
 #include <linux/export.h>
 #include <linux/percpu.h>
 #include <linux/init.h>
+#include <linux/interrupt.h>
 #include <linux/gfp.h>
 #include <linux/smp.h>
 #include <linux/cpu.h>
@@ -449,6 +450,9 @@ void flush_smp_call_function_from_idle(void)
 
        local_irq_save(flags);
        flush_smp_call_function_queue(true);
+       if (local_softirq_pending())
+               do_softirq();
+
        local_irq_restore(flags);
 }