diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-16 12:24:38 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-16 12:24:38 +0100 |
| commit | c3895b01e80d120e8d19435f7cb1fa4c60c4e269 (patch) | |
| tree | 426f36e999289eeb7a41f6f4ca8ff45bfc2372aa /arch/arm/common/gic.c | |
| parent | 3c68b4a8071fb11d905570d9b0e23034adc6c2bb (diff) | |
| parent | 968ea6d80e395cf11a51143cfa1b9a14ada676df (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-ingo into cpus4096
Diffstat (limited to 'arch/arm/common/gic.c')
| -rw-r--r-- | arch/arm/common/gic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c index 7fc9860a97d..c6884ba1d5e 100644 --- a/arch/arm/common/gic.c +++ b/arch/arm/common/gic.c @@ -109,11 +109,11 @@ static void gic_unmask_irq(unsigned int irq) } #ifdef CONFIG_SMP -static void gic_set_cpu(unsigned int irq, cpumask_t mask_val) +static void gic_set_cpu(unsigned int irq, const struct cpumask *mask_val) { void __iomem *reg = gic_dist_base(irq) + GIC_DIST_TARGET + (gic_irq(irq) & ~3); unsigned int shift = (irq % 4) * 8; - unsigned int cpu = first_cpu(mask_val); + unsigned int cpu = cpumask_first(mask_val); u32 val; spin_lock(&irq_controller_lock); |