diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-21 20:55:09 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-21 20:55:09 +0100 |
| commit | 57550b27ff5a13b00370fbfa34f2471c3456a41d (patch) | |
| tree | 09fbe86a7454b109821ae21a8f285d1f764eeaa8 /arch/x86/kernel | |
| parent | bfe085f62f98a49e1b864e4950389c7205174e4f (diff) | |
| parent | 13d428afc007fcfcd6deeb215618f54cf9c0cae6 (diff) | |
Merge commit 'v2.6.28-rc6' into x86/urgent
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/io_apic.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/x86/kernel/io_apic.c b/arch/x86/kernel/io_apic.c index 7a3f2028e2e..c9513e1ff28 100644 --- a/arch/x86/kernel/io_apic.c +++ b/arch/x86/kernel/io_apic.c @@ -1140,6 +1140,20 @@ static void __clear_irq_vector(int irq) cfg->vector = 0; cpus_clear(cfg->domain); + + if (likely(!cfg->move_in_progress)) + return; + cpus_and(mask, cfg->old_domain, cpu_online_map); + for_each_cpu_mask_nr(cpu, mask) { + for (vector = FIRST_EXTERNAL_VECTOR; vector < NR_VECTORS; + vector++) { + if (per_cpu(vector_irq, cpu)[vector] != irq) + continue; + per_cpu(vector_irq, cpu)[vector] = -1; + break; + } + } + cfg->move_in_progress = 0; } void __setup_vector_irq(int cpu) |