diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-04 10:16:31 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-04 10:16:31 -0400 |
| commit | 2ee73cc2d507df7b28050fba5d08bd33dd34848c (patch) | |
| tree | af5f33b265318e0f4b61f788691fe4f780ec402c /arch/arm/common/gic.c | |
| parent | c1d9728ecc5b560465df3c0c0d3b3825c2710b40 (diff) | |
| parent | ed39f731ab2e77e58122232f6e27333331d7793d (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/arm/common/gic.c')
| -rw-r--r-- | arch/arm/common/gic.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c index d74990717559..c02dc8116a18 100644 --- a/arch/arm/common/gic.c +++ b/arch/arm/common/gic.c | |||
| @@ -68,6 +68,7 @@ static void gic_unmask_irq(unsigned int irq) | |||
| 68 | writel(mask, gic_dist_base + GIC_DIST_ENABLE_SET + (irq / 32) * 4); | 68 | writel(mask, gic_dist_base + GIC_DIST_ENABLE_SET + (irq / 32) * 4); |
| 69 | } | 69 | } |
| 70 | 70 | ||
| 71 | #ifdef CONFIG_SMP | ||
| 71 | static void gic_set_cpu(struct irqdesc *desc, unsigned int irq, unsigned int cpu) | 72 | static void gic_set_cpu(struct irqdesc *desc, unsigned int irq, unsigned int cpu) |
| 72 | { | 73 | { |
| 73 | void __iomem *reg = gic_dist_base + GIC_DIST_TARGET + (irq & ~3); | 74 | 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 | |||
| 78 | val |= 1 << (cpu + shift); | 79 | val |= 1 << (cpu + shift); |
| 79 | writel(val, reg); | 80 | writel(val, reg); |
| 80 | } | 81 | } |
| 82 | #endif | ||
| 81 | 83 | ||
| 82 | static struct irqchip gic_chip = { | 84 | static struct irqchip gic_chip = { |
| 83 | .ack = gic_ack_irq, | 85 | .ack = gic_ack_irq, |