Merge branch '4.14-features' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[thirdparty/kernel/stable.git] / drivers / irqchip / irq-mips-gic.c

diff --git a/drivers/irqchip/irq-mips-gic.c b/drivers/irqchip/irq-mips-gic.c
index 7187af1bea03c3bc0e028709ed33e9d513dbdbfd..6e52a88bbd9e9cc7a832d67b13c717efe5cb039a 100644 (file)
--- a/drivers/irqchip/irq-mips-gic.c
+++ b/drivers/irqchip/irq-mips-gic.c
@@ -268,6 +268,7 @@ static int gic_set_affinity(struct irq_data *d, const struct cpumask *cpumask,
        if (read_gic_mask(irq))
                set_bit(irq, per_cpu_ptr(pcpu_masks, cpu));
 
+       irq_data_update_effective_affinity(d, cpumask_of(cpu));
        spin_unlock_irqrestore(&gic_lock, flags);
 
        return IRQ_SET_MASK_OK;
@@ -466,6 +467,7 @@ static int gic_irq_domain_map(struct irq_domain *d, unsigned int virq,
                if (err)
                        return err;
 
+               irqd_set_single_target(irq_desc_get_irq_data(irq_to_desc(virq)));
                return gic_shared_irq_domain_map(d, virq, hwirq, 0);
        }