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

Commit 6decf1a3 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

sh: Use irq_set_affinity instead of homebrewn code 



There is no point in having an incomplete copy of irq_set_affinity()
for the hotplug irq migration code.

Use the core function instead.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: sh <linux-sh@vger.kernel.org>
Link: http://lkml.kernel.org/r/20140223212736.774961401@linutronix.de


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 8f945a33

arch/sh/kernel/irq.c

+1 −17
Original line number Diff line number Diff line
@@ -217,19 +217,6 @@ void __init init_IRQ(void) 
}



#ifdef CONFIG_HOTPLUG_CPU

static void route_irq(struct irq_data *data, unsigned int irq, unsigned int cpu)

{

	struct irq_desc *desc = irq_to_desc(irq);

	struct irq_chip *chip = irq_data_get_irq_chip(data);



	printk(KERN_INFO "IRQ%u: moving from cpu%u to cpu%u\n",

	       irq, data->node, cpu);



	raw_spin_lock_irq(&desc->lock);

	chip->irq_set_affinity(data, cpumask_of(cpu), false);

	raw_spin_unlock_irq(&desc->lock);

}



/*

 * The CPU has been marked offline.  Migrate IRQs off this CPU.  If

 * the affinity settings do not allow other CPUs, force them onto any
@@ -250,11 +237,8 @@ void migrate_irqs(void) 
						    irq, cpu);



				cpumask_setall(data->affinity);

				newcpu = cpumask_any_and(data->affinity,

							 cpu_online_mask);

			}



			route_irq(data, irq, newcpu);

			irq_set_affinity(irq, data->affinity);

		}

	}

}