Merge branch 'torvalds/master'

[firefly-linux-kernel-4.4.55.git] / arch / mn10300 / kernel / smp.c

diff --git a/arch/mn10300/kernel/smp.c b/arch/mn10300/kernel/smp.c
index a17f9c9c14c9f3b7115d41f4ad765ee70de3ba2a..f984193718b1003f03861e79cd137b4a8c23badd 100644 (file)
--- a/arch/mn10300/kernel/smp.c
+++ b/arch/mn10300/kernel/smp.c
@@ -143,7 +143,7 @@ static struct irqaction call_function_ipi = {
 static irqreturn_t smp_ipi_timer_interrupt(int irq, void *dev_id);
 static struct irqaction local_timer_ipi = {
        .handler        = smp_ipi_timer_interrupt,
-       .flags          = IRQF_DISABLED | IRQF_NOBALANCING,
+       .flags          = IRQF_NOBALANCING,
        .name           = "smp local timer IPI"
 };
 #endif