diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-17 23:26:44 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-17 23:26:44 +0100 |
| commit | 6bf6d1af86e7dec914f7916f2a00910650a73469 (patch) | |
| tree | 7fb14c7fce10a9f3e5c48f49941b8642562017ec /arch/x86/kernel/apic/io_apic.c | |
| parent | 45a690f6bcd5506d9988d0d069811ac9380750ad (diff) | |
| parent | 63f49dce39e5d6a19e5f1f9004eb48e73ba259e8 (diff) | |
| download | linux-6bf6d1af86e7dec914f7916f2a00910650a73469.tar.gz linux-6bf6d1af86e7dec914f7916f2a00910650a73469.tar.bz2 linux-6bf6d1af86e7dec914f7916f2a00910650a73469.zip | |
Merge remote-tracking branch 'asoc/topic/blackfin' into for-3.7
Diffstat (limited to 'arch/x86/kernel/apic/io_apic.c')
| -rw-r--r-- | arch/x86/kernel/apic/io_apic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index 406eee784684..a6c64aaddf9a 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -1204,7 +1204,7 @@ static void __clear_irq_vector(int irq, struct irq_cfg *cfg) BUG_ON(!cfg->vector); vector = cfg->vector; - for_each_cpu(cpu, cfg->domain) + for_each_cpu_and(cpu, cfg->domain, cpu_online_mask) per_cpu(vector_irq, cpu)[vector] = -1; cfg->vector = 0; @@ -1212,7 +1212,7 @@ static void __clear_irq_vector(int irq, struct irq_cfg *cfg) if (likely(!cfg->move_in_progress)) return; - for_each_cpu(cpu, cfg->old_domain) { + for_each_cpu_and(cpu, cfg->old_domain, cpu_online_mask) { for (vector = FIRST_EXTERNAL_VECTOR; vector < NR_VECTORS; vector++) { if (per_cpu(vector_irq, cpu)[vector] != irq) |