Merge branch 'misc' into for-linus

[firefly-linux-kernel-4.4.55.git] / arch / mips / vr41xx / common / irq.c

diff --git a/arch/mips/vr41xx/common/irq.c b/arch/mips/vr41xx/common/irq.c
index 9ff7f397c0e14ed7520d266e5ad77dbad78bde91..fad2bef432cdd94ad509fe2d6b45d74ee36d3661 100644 (file)
--- a/arch/mips/vr41xx/common/irq.c
+++ b/arch/mips/vr41xx/common/irq.c
@@ -34,6 +34,7 @@ static irq_cascade_t irq_cascade[NR_IRQS] __cacheline_aligned;
 static struct irqaction cascade_irqaction = {
        .handler        = no_action,
        .name           = "cascade",
+       .flags          = IRQF_NO_THREAD,
 };
 
 int cascade_irq(unsigned int irq, int (*get_irq)(unsigned int))
@@ -87,7 +88,7 @@ static void irq_dispatch(unsigned int irq)
                        atomic_inc(&irq_err_count);
                else
                        irq_dispatch(irq);
-               if (!(desc->status & IRQ_DISABLED) && chip->irq_unmask)
+               if (!irqd_irq_disabled(idata) && chip->irq_unmask)
                        chip->irq_unmask(idata);
        } else
                do_IRQ(irq);