From e8c5f49f3d66fbc62289c23200ef94ec3e61d102 Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Fri, 30 Sep 2005 16:07:05 +0100 Subject: [PATCH] --- yaml --- r: 9467 b: refs/heads/master c: a06f5466c4576dcbf838a50a87903b0082774da7 h: refs/heads/master i: 9465: 4203cb733dd34d07c77f5cce120545a95ca5661b 9463: 86b23271eec0d16492c088f8a36e9e8b62e10b7c v: v3 --- [refs] | 2 +- trunk/arch/arm/common/gic.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 500dc90df1e3..f33d9ca03fb9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 481467d6fa4489aa42321a067e78bad26349488f +refs/heads/master: a06f5466c4576dcbf838a50a87903b0082774da7 diff --git a/trunk/arch/arm/common/gic.c b/trunk/arch/arm/common/gic.c index d74990717559..c02dc8116a18 100644 --- a/trunk/arch/arm/common/gic.c +++ b/trunk/arch/arm/common/gic.c @@ -68,6 +68,7 @@ static void gic_unmask_irq(unsigned int irq) writel(mask, gic_dist_base + GIC_DIST_ENABLE_SET + (irq / 32) * 4); } +#ifdef CONFIG_SMP static void gic_set_cpu(struct irqdesc *desc, unsigned int irq, unsigned int cpu) { void __iomem *reg = gic_dist_base + GIC_DIST_TARGET + (irq & ~3); @@ -78,6 +79,7 @@ static void gic_set_cpu(struct irqdesc *desc, unsigned int irq, unsigned int cpu val |= 1 << (cpu + shift); writel(val, reg); } +#endif static struct irqchip gic_chip = { .ack = gic_ack_irq,