| commit | 80c5520811d3805adcb15c570ea5e2d489fa5d0b | [log] [tgz] |
|---|---|---|
| author | Thomas Gleixner <tglx@linutronix.de> | Mon Mar 23 14:50:03 2009 +0100 |
| committer | Thomas Gleixner <tglx@linutronix.de> | Mon Mar 23 21:20:20 2009 +0100 |
| tree | ae797a7f4af39f80e77526533d06ac23b439f0ab | |
| parent | b3e3b302cf6dc8d60b67f0e84d1fa5648889c038 [diff] [blame] | |
| parent | 8c083f081d0014057901c68a0a3e0f8ca7ac8d23 [diff] [blame] |
Merge branch 'cpus4096' into irq/threaded Conflicts: arch/parisc/kernel/irq.c kernel/irq/handle.c Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c index adfd617..1c740f5 100644 --- a/arch/parisc/kernel/irq.c +++ b/arch/parisc/kernel/irq.c
@@ -138,7 +138,7 @@ if (cpu_dest < 0) return; - cpumask_copy(&irq_desc[irq].affinity, &cpumask_of_cpu(cpu_dest)); + cpumask_copy(&irq_desc[irq].affinity, dest); } #endif