Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[mirror_ubuntu-zesty-kernel.git] / drivers / irqchip / irq-bcm2836.c

diff --git a/drivers/irqchip/irq-bcm2836.c b/drivers/irqchip/irq-bcm2836.c
index f2575cb2b013f8120817bdf3a63886e2d12b6caf..d96b2c947e74e3edab3917551c64fbd1ced0f34c 100644 (file)
--- a/drivers/irqchip/irq-bcm2836.c
+++ b/drivers/irqchip/irq-bcm2836.c
@@ -180,7 +180,7 @@ __exception_irq_entry bcm2836_arm_irqchip_handle_irq(struct pt_regs *regs)
        } else if (stat) {
                u32 hwirq = ffs(stat) - 1;
 
-               handle_IRQ(irq_linear_revmap(intc.domain, hwirq), regs);
+               handle_domain_irq(intc.domain, hwirq, regs);
        }
 }
 
@@ -217,8 +217,8 @@ static int bcm2836_cpu_dying(unsigned int cpu)
 }
 
 #ifdef CONFIG_ARM
-int __init bcm2836_smp_boot_secondary(unsigned int cpu,
-                                     struct task_struct *idle)
+static int __init bcm2836_smp_boot_secondary(unsigned int cpu,
+                                            struct task_struct *idle)
 {
        unsigned long secondary_startup_phys =
                (unsigned long)virt_to_phys((void *)secondary_startup);