mirror of
https://github.com/torvalds/linux.git
synced 2024-11-30 08:01:59 +00:00
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>
This commit is contained in:
parent
8f945a3325
commit
6decf1a33c
@ -217,19 +217,6 @@ void __init init_IRQ(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_HOTPLUG_CPU
|
#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 CPU has been marked offline. Migrate IRQs off this CPU. If
|
||||||
* the affinity settings do not allow other CPUs, force them onto any
|
* the affinity settings do not allow other CPUs, force them onto any
|
||||||
@ -250,11 +237,8 @@ void migrate_irqs(void)
|
|||||||
irq, cpu);
|
irq, cpu);
|
||||||
|
|
||||||
cpumask_setall(data->affinity);
|
cpumask_setall(data->affinity);
|
||||||
newcpu = cpumask_any_and(data->affinity,
|
|
||||||
cpu_online_mask);
|
|
||||||
}
|
}
|
||||||
|
irq_set_affinity(irq, data->affinity);
|
||||||
route_irq(data, irq, newcpu);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user