diff options
author | Catalin Marinas <catalin.marinas@arm.com> | 2009-06-19 06:30:12 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-19 10:11:16 -0400 |
commit | 41184f6a5ef0d88529904d54f06f88b67fb76f4a (patch) | |
tree | d7d0f1587009f2ffcf90cd8c22884b64f76f1f05 /arch | |
parent | c3c2174031def62eeb8433dee8ef7e8d9493b1cf (diff) |
[ARM] 5556/1: Fix the irq_desc.cpu references
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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/common/gic.c | 2 | ||||
-rw-r--r-- | arch/arm/kernel/irq.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c index 664c7b8b1ba8..337741f734ac 100644 --- a/arch/arm/common/gic.c +++ b/arch/arm/common/gic.c | |||
@@ -117,7 +117,7 @@ static int gic_set_cpu(unsigned int irq, const struct cpumask *mask_val) | |||
117 | u32 val; | 117 | u32 val; |
118 | 118 | ||
119 | spin_lock(&irq_controller_lock); | 119 | spin_lock(&irq_controller_lock); |
120 | irq_desc[irq].cpu = cpu; | 120 | irq_desc[irq].node = cpu; |
121 | val = readl(reg) & ~(0xff << shift); | 121 | val = readl(reg) & ~(0xff << shift); |
122 | val |= 1 << (cpu + shift); | 122 | val |= 1 << (cpu + shift); |
123 | writel(val, reg); | 123 | writel(val, reg); |
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) { |