diff options
| author | Jacob Pan <jacob.jun.pan@linux.intel.com> | 2011-11-10 13:42:21 +0000 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-11-10 16:20:55 +0100 |
| commit | bb84ac2d3a603f8f6c7cc553a260e8ceaf871df2 (patch) | |
| tree | c8788b384a3551927455f7d1a77497e1260b03a2 /arch | |
| parent | cf8ff6b6ab0e99dd3058852f4ec76a6140abadec (diff) | |
| download | linux-stable-bb84ac2d3a603f8f6c7cc553a260e8ceaf871df2.tar.gz linux-stable-bb84ac2d3a603f8f6c7cc553a260e8ceaf871df2.tar.bz2 linux-stable-bb84ac2d3a603f8f6c7cc553a260e8ceaf871df2.zip | |
x86/apic: Do not clear nr_irqs_gsi if no legacy irqs
nr_legacy_irqs is set in probe_nr_irqs_gsi, we should not clear
it after that. Otherwise, the result is that MSI irqs will be
allocated from the wrong range for the systems without legacy
PIC.
Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
Signed-off-by: Dirk Brandewie <dirk.brandewie@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/apic/io_apic.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index 3c31fa98af6d..841b8da40525 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -193,10 +193,8 @@ int __init arch_early_irq_init(void) struct irq_cfg *cfg; int count, node, i; - if (!legacy_pic->nr_legacy_irqs) { - nr_irqs_gsi = 0; + if (!legacy_pic->nr_legacy_irqs) io_apic_irqs = ~0UL; - } for (i = 0; i < nr_ioapics; i++) { ioapics[i].saved_registers = |