diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-14 14:13:45 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-14 14:13:45 +0300 |
| commit | e46d51787e23a607cac5f593ac9926743a636dff (patch) | |
| tree | 4efb93f31c6eacb8fcbaa137acf894ea8d309e0e /arch/powerpc/sysdev/mpic.c | |
| parent | a4a0acf8e17e3d08e28b721ceceb898fbc959ceb (diff) | |
| parent | 4a046d1754ee6ebb6f399696805ed61ea0444d4c (diff) | |
| download | linux-e46d51787e23a607cac5f593ac9926743a636dff.tar.xz | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/travis/linux-2.6-cpus4096-for-ingo into cpus4096
Diffstat (limited to 'arch/powerpc/sysdev/mpic.c')
| -rw-r--r-- | arch/powerpc/sysdev/mpic.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c index 3e0d89dcdba2..0afd21f9a222 100644 --- a/arch/powerpc/sysdev/mpic.c +++ b/arch/powerpc/sysdev/mpic.c @@ -566,9 +566,10 @@ static void __init mpic_scan_ht_pics(struct mpic *mpic) #ifdef CONFIG_SMP static int irq_choose_cpu(unsigned int virt_irq) { - cpumask_t mask = irq_desc[virt_irq].affinity; + cpumask_t mask; int cpuid; + cpumask_copy(&mask, irq_desc[virt_irq].affinity); if (cpus_equal(mask, CPU_MASK_ALL)) { static int irq_rover; static DEFINE_SPINLOCK(irq_rover_lock); |