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

Commit 612e3684 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar
Browse files

genirq: fix the affinity setting in setup_irq 



The affinity setting in setup irq is called before the NO_BALANCING
flag is checked and might therefore override affinity settings from the
calling code with the default setting.

Move the NO_BALANCING flag check before the call to the affinity
setting.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent f6d87f4b

kernel/irq/manage.c

+5 −5
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ int do_irq_select_affinity(unsigned int irq, struct irq_desc *desc) 
	 * Preserve an userspace affinity setup, but make sure that

	 * one of the targets is online.

	 */

	if (desc->status & IRQ_AFFINITY_SET) {

	if (desc->status & (IRQ_AFFINITY_SET | IRQ_NO_BALANCING)) {

		if (cpus_intersects(desc->affinity, cpu_online_map))

			mask = desc->affinity;

		else
@@ -483,6 +483,10 @@ __setup_irq(unsigned int irq, struct irq_desc * desc, struct irqaction *new) 
			/* Undo nested disables: */

			desc->depth = 1;



		/* Exclude IRQ from balancing if requested */

		if (new->flags & IRQF_NOBALANCING)

			desc->status |= IRQ_NO_BALANCING;



		/* Set default affinity mask once everything is setup */

		do_irq_select_affinity(irq, desc);
@@ -497,10 +501,6 @@ __setup_irq(unsigned int irq, struct irq_desc * desc, struct irqaction *new) 


	*p = new;



	/* Exclude IRQ from balancing */

	if (new->flags & IRQF_NOBALANCING)

		desc->status |= IRQ_NO_BALANCING;



	/* Reset broken irq detection when installing new handler */

	desc->irq_count = 0;

	desc->irqs_unhandled = 0;