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/parisc/kernel/irq.c | |
parent | 3c68b4a8071fb11d905570d9b0e23034adc6c2bb (diff) | |
parent | 968ea6d80e395cf11a51143cfa1b9a14ada676df (diff) | |
download | linux-c3895b01e80d120e8d19435f7cb1fa4c60c4e269.tar.gz linux-c3895b01e80d120e8d19435f7cb1fa4c60c4e269.tar.bz2 linux-c3895b01e80d120e8d19435f7cb1fa4c60c4e269.zip |
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/parisc/kernel/irq.c')
-rw-r--r-- | arch/parisc/kernel/irq.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c index 23ef950df008..4cea935e2f99 100644 --- a/arch/parisc/kernel/irq.c +++ b/arch/parisc/kernel/irq.c @@ -131,12 +131,12 @@ int cpu_check_affinity(unsigned int irq, cpumask_t *dest) return 0; } -static void cpu_set_affinity_irq(unsigned int irq, cpumask_t dest) +static void cpu_set_affinity_irq(unsigned int irq, const struct cpumask *dest) { - if (cpu_check_affinity(irq, &dest)) + if (cpu_check_affinity(irq, dest)) return; - irq_desc[irq].affinity = dest; + irq_desc[irq].affinity = *dest; } #endif |