These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / arm / mach-dove / irq.c

diff --git a/kernel/arch/arm/mach-dove/irq.c b/kernel/arch/arm/mach-dove/irq.c
index df0223f..bfb3703 100644 (file)
--- a/kernel/arch/arm/mach-dove/irq.c
+++ b/kernel/arch/arm/mach-dove/irq.c
@@ -69,13 +69,14 @@ static struct irq_chip pmu_irq_chip = {
        .irq_ack        = pmu_irq_ack,
 };
 
-static void pmu_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void pmu_irq_handler(struct irq_desc *desc)
 {
        unsigned long cause = readl(PMU_INTERRUPT_CAUSE);
+       unsigned int irq;
 
        cause &= readl(PMU_INTERRUPT_MASK);
        if (cause == 0) {
-               do_bad_IRQ(irq, desc);
+               do_bad_IRQ(desc);
                return;
        }
 
@@ -172,7 +173,7 @@ void __init dove_init_irq(void)
        for (i = IRQ_DOVE_PMU_START; i < NR_IRQS; i++) {
                irq_set_chip_and_handler(i, &pmu_irq_chip, handle_level_irq);
                irq_set_status_flags(i, IRQ_LEVEL);
-               set_irq_flags(i, IRQF_VALID);
+               irq_clear_status_flags(i, IRQ_NOREQUEST);
        }
        irq_set_chained_handler(IRQ_DOVE_PMU, pmu_irq_handler);
 }