Merge tag 'for-linus' of git://github.com/openrisc/linux

[linux-2.6-microblaze.git] / drivers / irqchip / irq-bcm2836.c

diff --git a/drivers/irqchip/irq-bcm2836.c b/drivers/irqchip/irq-bcm2836.c
index 97838eb..5f5eb88 100644 (file)
--- a/drivers/irqchip/irq-bcm2836.c
+++ b/drivers/irqchip/irq-bcm2836.c
@@ -209,7 +209,7 @@ static int bcm2836_arm_irqchip_ipi_alloc(struct irq_domain *d,
                irq_set_percpu_devid(virq + i);
                irq_domain_set_info(d, virq + i, i, &bcm2836_arm_irqchip_ipi,
                                    d->host_data,
-                                   handle_percpu_devid_fasteoi_ipi,
+                                   handle_percpu_devid_irq,
                                    NULL, NULL);
        }
 
@@ -244,7 +244,7 @@ static int bcm2836_cpu_dying(unsigned int cpu)
 
 #define BITS_PER_MBOX  32
 
-static void bcm2836_arm_irqchip_smp_init(void)
+static void __init bcm2836_arm_irqchip_smp_init(void)
 {
        struct irq_fwspec ipi_fwspec = {
                .fwnode         = intc.domain->fwnode,