[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <4B87114C.5020503@kernel.org>
Date: Thu, 25 Feb 2010 16:09:48 -0800
From: Yinghai Lu <yinghai@...nel.org>
To: "H. Peter Anvin" <hpa@...or.com>, Ingo Molnar <mingo@...e.hu>,
Thomas Gleixner <tglx@...utronix.de>
CC: "Pan, Jacob jun" <jacob.jun.pan@...el.com>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: [PATCH -v2] x86: set nr_irqs_gsi only in probe_nr_irqs_gsi
don't clear that in arch_early_irq_init
probe_nr_irqs_gsi is always called when ioapic is selected in config.
so even for mrst, print out from probe_nr_irqs_gsi is report correct
nr_irqs_gsi
-v2: remove io_apic_irqs assignement, setup_IO_APIC will do that.
Signed-off-by: Yinghai Lu <yinghai@...nel.org>
---
arch/x86/kernel/apic/io_apic.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
Index: linux-2.6/arch/x86/kernel/apic/io_apic.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/apic/io_apic.c
+++ linux-2.6/arch/x86/kernel/apic/io_apic.c
@@ -151,11 +151,6 @@ int __init arch_early_irq_init(void)
int node;
int i;
- if (!legacy_pic->nr_legacy_irqs) {
- nr_irqs_gsi = 0;
- io_apic_irqs = ~0UL;
- }
-
cfg = irq_cfgx;
count = ARRAY_SIZE(irq_cfgx);
node= cpu_to_node(boot_cpu_id);
@@ -3857,6 +3852,8 @@ void __init probe_nr_irqs_gsi(void)
{
int nr = 0;
+ nr_irqs_gsi = legacy_pic->nr_legacy_irqs;
+
nr = acpi_probe_gsi();
if (nr > nr_irqs_gsi) {
nr_irqs_gsi = nr;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists