redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

sh: fix up cpu hotplug IRQ migration for irq_data changes.

Browse source 
This fixes up the __cpu_disable() path's IRQ migration for the
irq_data changes.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Paul Mundt 2010-10-28 11:33:21 +09:00
parent 7c842470f3
commit fb41a49d96
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
arch/sh/kernel/irq.c
View file

@ -296,13 +296,16 @@ int __init arch_probe_nr_irqs(void)
#endif #endif
#ifdef CONFIG_HOTPLUG_CPU #ifdef CONFIG_HOTPLUG_CPU
static void route_irq(struct irq_desc *desc, unsigned int irq, unsigned int 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", printk(KERN_INFO "IRQ%u: moving from cpu%u to cpu%u\n",
irq, desc->node, cpu); irq, data->node, cpu);
raw_spin_lock_irq(&desc->lock); raw_spin_lock_irq(&desc->lock);
desc->chip->set_affinity(irq, cpumask_of(cpu)); chip->irq_set_affinity(data, cpumask_of(cpu), false);
raw_spin_unlock_irq(&desc->lock); raw_spin_unlock_irq(&desc->lock);
} }
@ -313,24 +316,25 @@ static void route_irq(struct irq_desc *desc, unsigned int irq, unsigned int cpu)
*/ */
void migrate_irqs(void) void migrate_irqs(void)
{ {
struct irq_desc *desc;
unsigned int irq, cpu = smp_processor_id(); unsigned int irq, cpu = smp_processor_id();
for_each_irq_desc(irq, desc) { for_each_active_irq(irq) {
if (desc->node == cpu) { struct irq_data *data = irq_get_irq_data(irq);
unsigned int newcpu = cpumask_any_and(desc->affinity,
if (data->node == cpu) {
unsigned int newcpu = cpumask_any_and(data->affinity,
cpu_online_mask); cpu_online_mask);
if (newcpu >= nr_cpu_ids) { if (newcpu >= nr_cpu_ids) {
if (printk_ratelimit()) if (printk_ratelimit())
printk(KERN_INFO "IRQ%u no longer affine to CPU%u\n", printk(KERN_INFO "IRQ%u no longer affine to CPU%u\n",
irq, cpu); irq, cpu);
cpumask_setall(desc->affinity); cpumask_setall(data->affinity);
newcpu = cpumask_any_and(desc->affinity, newcpu = cpumask_any_and(data->affinity,
cpu_online_mask); cpu_online_mask);
} }
route_irq(desc, irq, newcpu); route_irq(data, irq, newcpu);
} }
} }
} }