Loading arch/ia64/kernel/irq.c +14 −13 Original line number Original line Diff line number Diff line Loading @@ -130,11 +130,12 @@ unsigned int vectors_in_migration[NR_IRQS]; */ */ static void migrate_irqs(void) static void migrate_irqs(void) { { struct irq_desc *desc; int irq, new_cpu; int irq, new_cpu; for (irq=0; irq < NR_IRQS; irq++) { for (irq=0; irq < NR_IRQS; irq++) { desc = irq_desc + irq; struct irq_desc *desc = irq_to_desc(irq); struct irq_data *data = irq_desc_get_irq_data(desc); struct irq_chip *chip = irq_data_get_irq_chip(data); if (desc->status == IRQ_DISABLED) if (desc->status == IRQ_DISABLED) continue; continue; Loading @@ -145,10 +146,10 @@ static void migrate_irqs(void) * tell CPU not to respond to these local intr sources. * tell CPU not to respond to these local intr sources. * such as ITV,CPEI,MCA etc. * such as ITV,CPEI,MCA etc. */ */ if (desc->status == IRQ_PER_CPU) if (irqd_is_per_cpu(data)) continue; continue; if (cpumask_any_and(irq_desc[irq].affinity, cpu_online_mask) if (cpumask_any_and(data->affinity, cpu_online_mask) >= nr_cpu_ids) { >= nr_cpu_ids) { /* /* * Save it for phase 2 processing * Save it for phase 2 processing Loading @@ -160,16 +161,16 @@ static void migrate_irqs(void) /* /* * Al three are essential, currently WARN_ON.. maybe panic? * Al three are essential, currently WARN_ON.. maybe panic? */ */ if (desc->chip && desc->chip->disable && if (chip && chip->irq_disable && desc->chip->enable && desc->chip->set_affinity) { chip->irq_enable && chip->irq_set_affinity) { desc->chip->disable(irq); chip->irq_disable(data); desc->chip->set_affinity(irq, chip->irq_set_affinity(data, cpumask_of(new_cpu)); cpumask_of(new_cpu), false); desc->chip->enable(irq); chip->irq_enable(data); } else { } else { WARN_ON((!(desc->chip) || !(desc->chip->disable) || WARN_ON((!chip || !chip->irq_disable || !(desc->chip->enable) || !chip->irq_enable || !(desc->chip->set_affinity))); !chip->irq_set_affinity)); } } } } } } Loading Loading
arch/ia64/kernel/irq.c +14 −13 Original line number Original line Diff line number Diff line Loading @@ -130,11 +130,12 @@ unsigned int vectors_in_migration[NR_IRQS]; */ */ static void migrate_irqs(void) static void migrate_irqs(void) { { struct irq_desc *desc; int irq, new_cpu; int irq, new_cpu; for (irq=0; irq < NR_IRQS; irq++) { for (irq=0; irq < NR_IRQS; irq++) { desc = irq_desc + irq; struct irq_desc *desc = irq_to_desc(irq); struct irq_data *data = irq_desc_get_irq_data(desc); struct irq_chip *chip = irq_data_get_irq_chip(data); if (desc->status == IRQ_DISABLED) if (desc->status == IRQ_DISABLED) continue; continue; Loading @@ -145,10 +146,10 @@ static void migrate_irqs(void) * tell CPU not to respond to these local intr sources. * tell CPU not to respond to these local intr sources. * such as ITV,CPEI,MCA etc. * such as ITV,CPEI,MCA etc. */ */ if (desc->status == IRQ_PER_CPU) if (irqd_is_per_cpu(data)) continue; continue; if (cpumask_any_and(irq_desc[irq].affinity, cpu_online_mask) if (cpumask_any_and(data->affinity, cpu_online_mask) >= nr_cpu_ids) { >= nr_cpu_ids) { /* /* * Save it for phase 2 processing * Save it for phase 2 processing Loading @@ -160,16 +161,16 @@ static void migrate_irqs(void) /* /* * Al three are essential, currently WARN_ON.. maybe panic? * Al three are essential, currently WARN_ON.. maybe panic? */ */ if (desc->chip && desc->chip->disable && if (chip && chip->irq_disable && desc->chip->enable && desc->chip->set_affinity) { chip->irq_enable && chip->irq_set_affinity) { desc->chip->disable(irq); chip->irq_disable(data); desc->chip->set_affinity(irq, chip->irq_set_affinity(data, cpumask_of(new_cpu)); cpumask_of(new_cpu), false); desc->chip->enable(irq); chip->irq_enable(data); } else { } else { WARN_ON((!(desc->chip) || !(desc->chip->disable) || WARN_ON((!chip || !chip->irq_disable || !(desc->chip->enable) || !chip->irq_enable || !(desc->chip->set_affinity))); !chip->irq_set_affinity)); } } } } } } Loading