Merge branch 'for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata

[firefly-linux-kernel-4.4.55.git] / arch / arm / kernel / irq.c

diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c
index 5c4d38e32a5128a48ce20cc9d2757465e4e7b935..7c81ec428b9b5397b05526d9c45c6c8d39508b8c 100644 (file)
--- a/arch/arm/kernel/irq.c
+++ b/arch/arm/kernel/irq.c
@@ -65,24 +65,7 @@ int arch_show_interrupts(struct seq_file *p, int prec)
  */
 void handle_IRQ(unsigned int irq, struct pt_regs *regs)
 {
-       struct pt_regs *old_regs = set_irq_regs(regs);
-
-       irq_enter();
-
-       /*
-        * Some hardware gives randomly wrong interrupts.  Rather
-        * than crashing, do something sensible.
-        */
-       if (unlikely(irq >= nr_irqs)) {
-               if (printk_ratelimit())
-                       printk(KERN_WARNING "Bad IRQ%u\n", irq);
-               ack_bad_irq(irq);
-       } else {
-               generic_handle_irq(irq);
-       }
-
-       irq_exit();
-       set_irq_regs(old_regs);
+       __handle_domain_irq(NULL, irq, false, regs);
 }
 
 /*
@@ -205,8 +188,8 @@ void migrate_irqs(void)
                raw_spin_unlock(&desc->lock);
 
                if (affinity_broken && printk_ratelimit())
-                       pr_warning("IRQ%u no longer affine to CPU%u\n", i,
-                               smp_processor_id());
+                       pr_warn("IRQ%u no longer affine to CPU%u\n",
+                               i, smp_processor_id());
        }
 
        local_irq_restore(flags);