Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f15a648 authored by Paul Burton's avatar Paul Burton Committed by Ralf Baechle
Browse files

irqchip: mips-gic: Let the core set struct irq_common_data affinity 



gic_set_affinity() manually copies the provided cpumask to the struct
irq_common_data affinity field, returning IRQ_SET_MASK_OK_NOCOPY in
order to prevent the core code from doing that.

We can instead simply let the core code do it for us, by returning
IRQ_SET_MASK_OK instead of IRQ_SET_MASK_OK_NOCOPY & doing the copy
ourselves.

[ralf@linux-mips.org: Resolve merge conflict.]

Signed-off-by: default avatarPaul Burton <paul.burton@imgtec.com>
Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/17056/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 07df8bfe

drivers/irqchip/irq-mips-gic.c

+1 −2
Original line number Diff line number Diff line
@@ -268,10 +268,9 @@ 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));



	cpumask_copy(irq_data_get_affinity_mask(d), cpumask);

	spin_unlock_irqrestore(&gic_lock, flags);



	return IRQ_SET_MASK_OK_NOCOPY;

	return IRQ_SET_MASK_OK;

}

#endif