summaryrefslogtreecommitdiffstats
path: root/arch/arm/common/gic.c
diff options
context:
space:
mode:
authorCatalin Marinas <catalin.marinas@arm.com>2009-06-19 11:30:12 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-06-19 15:11:16 +0100
commit41184f6a5ef0d88529904d54f06f88b67fb76f4a (patch)
treed7d0f1587009f2ffcf90cd8c22884b64f76f1f05 /arch/arm/common/gic.c
parentc3c2174031def62eeb8433dee8ef7e8d9493b1cf (diff)
downloadlinux-41184f6a5ef0d88529904d54f06f88b67fb76f4a.tar.bz2
[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/arm/common/gic.c')
-rw-r--r--arch/arm/common/gic.c2
1 files changed, 1 insertions, 1 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)
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);