Merge branch 'linus' into x86/apic, to resolve conflicts

[linux-2.6-microblaze.git] / drivers / irqchip / irq-gic-v3-its.c

diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c
index e883956..e2339af 100644 (file)
--- a/drivers/irqchip/irq-gic-v3-its.c
+++ b/drivers/irqchip/irq-gic-v3-its.c
@@ -2209,8 +2209,8 @@ static int its_irq_domain_alloc(struct irq_domain *domain, unsigned int virq,
        return 0;
 }
 
-static void its_irq_domain_activate(struct irq_domain *domain,
-                                   struct irq_data *d)
+static int its_irq_domain_activate(struct irq_domain *domain,
+                                  struct irq_data *d, bool early)
 {
        struct its_device *its_dev = irq_data_get_irq_chip_data(d);
        u32 event = its_get_event_id(d);
@@ -2228,6 +2228,7 @@ static void its_irq_domain_activate(struct irq_domain *domain,
 
        /* Map the GIC IRQ and event to the device */
        its_send_mapti(its_dev, d->hwirq, event);
+       return 0;
 }
 
 static void its_irq_domain_deactivate(struct irq_domain *domain,
@@ -2701,8 +2702,8 @@ static int its_vpe_irq_domain_alloc(struct irq_domain *domain, unsigned int virq
        return err;
 }
 
-static void its_vpe_irq_domain_activate(struct irq_domain *domain,
-                                       struct irq_data *d)
+static int its_vpe_irq_domain_activate(struct irq_domain *domain,
+                                      struct irq_data *d, bool early)
 {
        struct its_vpe *vpe = irq_data_get_irq_chip_data(d);
 
@@ -2710,6 +2711,7 @@ static void its_vpe_irq_domain_activate(struct irq_domain *domain,
        vpe->col_idx = cpumask_first(cpu_online_mask);
        its_send_vmapp(vpe, true);
        its_send_vinvall(vpe);
+       return 0;
 }
 
 static void its_vpe_irq_domain_deactivate(struct irq_domain *domain,