From: Henrik Kretzschmar <henne@nachtwindheim.de>
Subject: [PATCH 5/6] x86: ifdef ioapic related function out
Date: Mon, 14 Feb 2011 11:00:11 +0100
Lines: 29
Message-ID: <1297677612-12405-5-git-send-email-henne@nachtwindheim.de>
References: <1297677612-12405-1-git-send-email-henne@nachtwindheim.de>
Cc: tglx@linutronix.de, hpa@zytor.com, x86@kernel.org, tj@kernel.org,
	yinghai@kernel.org, ak@linux.intel.com, robert.richter@amd.com,
	linux-kernel@vger.kernel.org, henne@nachtwindheim.de
To: mingo@readhat.com
X-From: linux-kernel-owner@vger.kernel.org Mon Feb 14 11:01:27 2011
Return-path: <linux-kernel-owner@vger.kernel.org>
Envelope-to: glk-linux-kernel-3@lo.gmane.org
Received: from vger.kernel.org ([209.132.180.67])
	by lo.gmane.org with esmtp (Exim 4.69)
	(envelope-from <linux-kernel-owner@vger.kernel.org>)
	id 1PovFE-0006cV-Cn
	for glk-linux-kernel-3@lo.gmane.org; Mon, 14 Feb 2011 11:01:24 +0100
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753212Ab1BNKAq (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>);
	Mon, 14 Feb 2011 05:00:46 -0500
Received: from server103.greatnet.de ([83.133.97.6]:38350 "EHLO
	server103.greatnet.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752841Ab1BNKAZ (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Mon, 14 Feb 2011 05:00:25 -0500
Received: from localhost.localdomain (cmnz-d9bab6be.pool.mediaWays.net [217.186.182.190])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by server103.greatnet.de (Postfix) with ESMTPSA id 37BBE950DB6;
	Mon, 14 Feb 2011 10:59:09 +0100 (CET)
X-Mailer: git-send-email 1.7.1
In-Reply-To: <1297677612-12405-1-git-send-email-henne@nachtwindheim.de>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1099650>

arch_disable_smp_config() is an IO-APIC related function on x86,
and should only be needed if SMP is enabled.
But the IO-APIC code calls it when the parameter "noapic" is given to
the kernel, which doesn't mean SMP is enabled.

Anyway this fixes compilation on x86_32 UP systems with APIC and no IO-APIC.

Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
---
 arch/x86/kernel/apic/apic.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 999c531..4998f0a 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -1218,7 +1218,9 @@ void __cpuinit setup_local_APIC(void)
 		rdtscll(tsc);
 
 	if (disable_apic) {
+#ifdef CONFIG_X86_IO_APIC
 		arch_disable_smp_support();
+#endif
 		return;
 	}
 
-- 
1.7.2.3