1 From: Henrik Kretzschmar <henne@nachtwindheim.de>
2 Subject: [PATCH 5/6] x86: ifdef ioapic related function out
3 Date: Mon, 14 Feb 2011 11:00:11 +0100
5 Message-ID: <1297677612-12405-5-git-send-email-henne@nachtwindheim.de>
6 References: <1297677612-12405-1-git-send-email-henne@nachtwindheim.de>
7 Cc: tglx@linutronix.de, hpa@zytor.com, x86@kernel.org, tj@kernel.org,
8 yinghai@kernel.org, ak@linux.intel.com, robert.richter@amd.com,
9 linux-kernel@vger.kernel.org, henne@nachtwindheim.de
11 X-From: linux-kernel-owner@vger.kernel.org Mon Feb 14 11:01:27 2011
12 Return-path: <linux-kernel-owner@vger.kernel.org>
13 Envelope-to: glk-linux-kernel-3@lo.gmane.org
14 Received: from vger.kernel.org ([209.132.180.67])
15 by lo.gmane.org with esmtp (Exim 4.69)
16 (envelope-from <linux-kernel-owner@vger.kernel.org>)
18 for glk-linux-kernel-3@lo.gmane.org; Mon, 14 Feb 2011 11:01:24 +0100
19 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
20 id S1753212Ab1BNKAq (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>);
21 Mon, 14 Feb 2011 05:00:46 -0500
22 Received: from server103.greatnet.de ([83.133.97.6]:38350 "EHLO
23 server103.greatnet.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
24 with ESMTP id S1752841Ab1BNKAZ (ORCPT
25 <rfc822;linux-kernel@vger.kernel.org>);
26 Mon, 14 Feb 2011 05:00:25 -0500
27 Received: from localhost.localdomain (cmnz-d9bab6be.pool.mediaWays.net [217.186.182.190])
28 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
29 (No client certificate requested)
30 by server103.greatnet.de (Postfix) with ESMTPSA id 37BBE950DB6;
31 Mon, 14 Feb 2011 10:59:09 +0100 (CET)
32 X-Mailer: git-send-email 1.7.1
33 In-Reply-To: <1297677612-12405-1-git-send-email-henne@nachtwindheim.de>
34 Sender: linux-kernel-owner@vger.kernel.org
36 List-ID: <linux-kernel.vger.kernel.org>
37 X-Mailing-List: linux-kernel@vger.kernel.org
38 Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1099650>
40 arch_disable_smp_config() is an IO-APIC related function on x86,
41 and should only be needed if SMP is enabled.
42 But the IO-APIC code calls it when the parameter "noapic" is given to
43 the kernel, which doesn't mean SMP is enabled.
45 Anyway this fixes compilation on x86_32 UP systems with APIC and no IO-APIC.
47 Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
49 arch/x86/kernel/apic/apic.c | 2 ++
50 1 files changed, 2 insertions(+), 0 deletions(-)
52 diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
53 index 999c531..4998f0a 100644
54 --- a/arch/x86/kernel/apic/apic.c
55 +++ b/arch/x86/kernel/apic/apic.c
56 @@ -1218,7 +1218,9 @@ void __cpuinit setup_local_APIC(void)
60 +#ifdef CONFIG_X86_IO_APIC
61 arch_disable_smp_support();