From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753832Ab0CVBiL (ORCPT ); Sun, 21 Mar 2010 21:38:11 -0400 Received: from rcsinet12.oracle.com ([148.87.113.124]:29070 "EHLO rcsinet12.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753778Ab0CVBiI (ORCPT ); Sun, 21 Mar 2010 21:38:08 -0400 From: Yinghai Lu To: Ingo Molnar , Thomas Gleixner , "H. Peter Anvin" , Andrew Morton , "Eric W. Biederman" , Jesse Barnes Cc: linux-kernel@vger.kernel.org, Yinghai Lu Subject: [PATCH 03/10] x86: set nr_irqs_gsi only in probe_nr_irqs_gsi Date: Sun, 21 Mar 2010 18:36:03 -0700 Message-Id: <1269221770-9667-4-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.6.4.2 In-Reply-To: <1269221770-9667-1-git-send-email-yinghai@kernel.org> References: <1269221770-9667-1-git-send-email-yinghai@kernel.org> X-Source-IP: acsmt354.oracle.com [141.146.40.154] X-Auth-Type: Internal IP X-CT-RefId: str=0001.0A090206.4BA6C9E8.005A,ss=1,fgs=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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