[PATCH 09/20] x86: set nr_irqs_gsi only in probe_nr_irqs_gsi
in [Kernel]
|
Prev: panic: Add taint flag TAINT_FIRMWARE_WORKAROUND ('I')
Next: [PATCH] m68k: Fix asm constraints for atomic_sub_and_test() and atomic_add_negative() (was: Re: atomic_sub_and_test() asm constraints)
From: Yinghai Lu on 21 Mar 2010 03:30 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(a)kernel.org> --- arch/x86/kernel/apic/io_apic.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index 61b59ef..ba469f8 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -153,11 +153,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); @@ -3938,6 +3933,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; -- 1.6.4.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |