diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2012-09-27 18:00:07 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2012-09-27 18:00:07 +0200 |
| commit | 9b11d4370c3a425e18ffccc1e93062864eca7337 (patch) | |
| tree | 8d47c82a6a612e3b1ff56e2fa40af44223e676ed /arch/x86/kernel/irq.c | |
| parent | MIPS: Replace `-' in defconfig filename wth `_' for consistency. (diff) | |
| parent | MIPS: OCTEON: Register ciu/ciu2 as the default irq_domain. (diff) | |
| download | linux-9b11d4370c3a425e18ffccc1e93062864eca7337.tar.xz linux-9b11d4370c3a425e18ffccc1e93062864eca7337.zip | |
Merge branch 'cn68xx-ciu2' of git://git.linux-mips.org/pub/scm/daney/upstream-daney into mips-for-linux-next
Diffstat (limited to 'arch/x86/kernel/irq.c')
| -rw-r--r-- | arch/x86/kernel/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c index 7ad683d78645..d44f7829968e 100644 --- a/arch/x86/kernel/irq.c +++ b/arch/x86/kernel/irq.c @@ -270,7 +270,7 @@ void fixup_irqs(void) if (cpumask_any_and(affinity, cpu_online_mask) >= nr_cpu_ids) { break_affinity = 1; - affinity = cpu_all_mask; + affinity = cpu_online_mask; } chip = irq_data_get_irq_chip(data); |