diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2014-02-23 21:40:10 +0000 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2014-03-04 17:37:55 +0100 |
commit | 6decf1a33c386d4addc2ed9d269c3868f08c70bb (patch) | |
tree | 25c97c879632d9dcd2ce88958bcd5f31919ffbc0 /arch/sh | |
parent | 8f945a3325bbe0dd651e2f496a53df9b06fc6d07 (diff) | |
download | linux-stable-6decf1a33c386d4addc2ed9d269c3868f08c70bb.tar.gz linux-stable-6decf1a33c386d4addc2ed9d269c3868f08c70bb.tar.bz2 linux-stable-6decf1a33c386d4addc2ed9d269c3868f08c70bb.zip |
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: Thomas 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: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/kernel/irq.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c index 0833736afa32..65a1ecd77f96 100644 --- a/arch/sh/kernel/irq.c +++ b/arch/sh/kernel/irq.c @@ -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); } } } |