aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacob Pan <jacob.jun.pan@linux.intel.com>2010-12-08 10:57:19 +0000
committerAlan Cox <alan@linux.intel.com>2010-12-08 10:57:19 +0000
commit073305e2eedffe0905c4d7859f639a4a03fdc2ba (patch)
tree24a03806ab8b0d2aecc40f16cbfcbf259d7bf17b
parent492e907a449c0c7a6be309297d03116f7af5d50e (diff)
downloadmrst-s0i3-test-073305e2eedffe0905c4d7859f639a4a03fdc2ba.tar.gz
mrst-s0i3-test-073305e2eedffe0905c4d7859f639a4a03fdc2ba.tar.xz
mrst-s0i3-test-073305e2eedffe0905c4d7859f639a4a03fdc2ba.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>
-rw-r--r--arch/x86/kernel/apic/io_apic.c4
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 7cc0a721f62..86e4b6c36b2 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -148,10 +148,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;
- }
cfg = irq_cfgx;
count = ARRAY_SIZE(irq_cfgx);