Merge tag 'drm-intel-next-2015-09-11' of git://anongit.freedesktop.org/drm-intel...

[linux-2.6-block.git] / arch / parisc / kernel / irq.c

diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c
index 413ec3c3f9cc509099b25bf3fc60e0de8195ba53..ba5e1c7b1f177d45f743392c0950017622b143a8 100644 (file)
--- a/arch/parisc/kernel/irq.c
+++ b/arch/parisc/kernel/irq.c
@@ -507,8 +507,8 @@ void do_cpu_irq_mask(struct pt_regs *regs)
        struct pt_regs *old_regs;
        unsigned long eirr_val;
        int irq, cpu = smp_processor_id();
-#ifdef CONFIG_SMP
        struct irq_data *irq_data;
+#ifdef CONFIG_SMP
        cpumask_t dest;
 #endif
 
@@ -521,8 +521,13 @@ void do_cpu_irq_mask(struct pt_regs *regs)
                goto set_out;
        irq = eirr_to_irq(eirr_val);
 
-#ifdef CONFIG_SMP
        irq_data = irq_get_irq_data(irq);
+
+       /* Filter out spurious interrupts, mostly from serial port at bootup */
+       if (unlikely(!irq_desc_has_action(irq_data_to_desc(irq_data))))
+               goto set_out;
+
+#ifdef CONFIG_SMP
        cpumask_copy(&dest, irq_data_get_affinity_mask(irq_data));
        if (irqd_is_per_cpu(irq_data) &&
            !cpumask_test_cpu(smp_processor_id(), &dest)) {