Skip to content

Commit

Permalink
ARM: CPU hotplug: fix abuse of irqdesc->node
Browse files Browse the repository at this point in the history
irqdesc's node member is supposed to mark the numa node number for the
interrupt.  Our use of it is non-standard.  Remove this, replacing the
functionality with a test of the affinity mask.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Russell King committed Jul 21, 2011
1 parent cf6ace1 commit 2ef7570
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
1 change: 0 additions & 1 deletion arch/arm/common/gic.c
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,6 @@ static int gic_set_affinity(struct irq_data *d, const struct cpumask *mask_val,
bit = 1 << (cpu + shift);

spin_lock(&irq_controller_lock);
d->node = cpu;
val = readl_relaxed(reg) & ~mask;
writel_relaxed(val | bit, reg);
spin_unlock(&irq_controller_lock);
Expand Down
10 changes: 2 additions & 8 deletions arch/arm/kernel/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -166,15 +166,9 @@ void migrate_irqs(void)
bool affinity_broken = false;

raw_spin_lock(&desc->lock);
do {
if (desc->action == NULL)
break;

if (d->node != cpu)
break;

if (desc->action != NULL &&
cpumask_test_cpu(smp_processor_id(), d->affinity))
affinity_broken = migrate_one_irq(d);
} while (0);
raw_spin_unlock(&desc->lock);

if (affinity_broken && printk_ratelimit())
Expand Down

0 comments on commit 2ef7570

Please sign in to comment.