Skip to content

Commit

Permalink
[ARM] 5556/1: Fix the irq_desc.cpu references
Browse files Browse the repository at this point in the history
The cpu member of struct irq_desc was recently renamed to node. The
patch renames the ARM references to the old member.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Catalin Marinas authored and Russell King committed Jun 19, 2009
1 parent c3c2174 commit 41184f6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion arch/arm/common/gic.c
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ static int gic_set_cpu(unsigned int irq, const struct cpumask *mask_val)
u32 val;

spin_lock(&irq_controller_lock);
irq_desc[irq].cpu = cpu;
irq_desc[irq].node = cpu;
val = readl(reg) & ~(0xff << shift);
val |= 1 << (cpu + shift);
writel(val, reg);
Expand Down
6 changes: 3 additions & 3 deletions arch/arm/kernel/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ void __init init_IRQ(void)

#ifdef CONFIG_SMP
cpumask_setall(bad_irq_desc.affinity);
bad_irq_desc.cpu = smp_processor_id();
bad_irq_desc.node = smp_processor_id();
#endif
init_arch_irq();
}
Expand All @@ -176,7 +176,7 @@ void __init init_IRQ(void)

static void route_irq(struct irq_desc *desc, unsigned int irq, unsigned int cpu)
{
pr_debug("IRQ%u: moving from cpu%u to cpu%u\n", irq, desc->cpu, cpu);
pr_debug("IRQ%u: moving from cpu%u to cpu%u\n", irq, desc->node, cpu);

spin_lock_irq(&desc->lock);
desc->chip->set_affinity(irq, cpumask_of(cpu));
Expand All @@ -195,7 +195,7 @@ void migrate_irqs(void)
for (i = 0; i < NR_IRQS; i++) {
struct irq_desc *desc = irq_desc + i;

if (desc->cpu == cpu) {
if (desc->node == cpu) {
unsigned int newcpu = cpumask_any_and(desc->affinity,
cpu_online_mask);
if (newcpu >= nr_cpu_ids) {
Expand Down

0 comments on commit 41184f6

Please sign in to comment.