diff options
Diffstat (limited to 'arch/arm/kernel/irq.c')
| -rw-r--r-- | arch/arm/kernel/irq.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c index 6874c7dca75a..096f600dc8d8 100644 --- a/arch/arm/kernel/irq.c +++ b/arch/arm/kernel/irq.c | |||
| @@ -167,7 +167,7 @@ void __init init_IRQ(void) | |||
| 167 | 167 | ||
| 168 | #ifdef CONFIG_SMP | 168 | #ifdef CONFIG_SMP |
| 169 | cpumask_setall(bad_irq_desc.affinity); | 169 | cpumask_setall(bad_irq_desc.affinity); |
| 170 | bad_irq_desc.cpu = smp_processor_id(); | 170 | bad_irq_desc.node = smp_processor_id(); |
| 171 | #endif | 171 | #endif |
| 172 | init_arch_irq(); | 172 | init_arch_irq(); |
| 173 | } | 173 | } |
| @@ -176,7 +176,7 @@ void __init init_IRQ(void) | |||
| 176 | 176 | ||
| 177 | static void route_irq(struct irq_desc *desc, unsigned int irq, unsigned int cpu) | 177 | static void route_irq(struct irq_desc *desc, unsigned int irq, unsigned int cpu) |
| 178 | { | 178 | { |
| 179 | pr_debug("IRQ%u: moving from cpu%u to cpu%u\n", irq, desc->cpu, cpu); | 179 | pr_debug("IRQ%u: moving from cpu%u to cpu%u\n", irq, desc->node, cpu); |
| 180 | 180 | ||
| 181 | spin_lock_irq(&desc->lock); | 181 | spin_lock_irq(&desc->lock); |
| 182 | desc->chip->set_affinity(irq, cpumask_of(cpu)); | 182 | desc->chip->set_affinity(irq, cpumask_of(cpu)); |
| @@ -195,7 +195,7 @@ void migrate_irqs(void) | |||
| 195 | for (i = 0; i < NR_IRQS; i++) { | 195 | for (i = 0; i < NR_IRQS; i++) { |
| 196 | struct irq_desc *desc = irq_desc + i; | 196 | struct irq_desc *desc = irq_desc + i; |
| 197 | 197 | ||
| 198 | if (desc->cpu == cpu) { | 198 | if (desc->node == cpu) { |
| 199 | unsigned int newcpu = cpumask_any_and(desc->affinity, | 199 | unsigned int newcpu = cpumask_any_and(desc->affinity, |
| 200 | cpu_online_mask); | 200 | cpu_online_mask); |
| 201 | if (newcpu >= nr_cpu_ids) { | 201 | if (newcpu >= nr_cpu_ids) { |
