1 From: Henrik Kretzschmar <henne@nachtwindheim.de>
2 Subject: [PATCH 2/6] x86: ifdef enable_IR_x2apic() out
3 Date: Mon, 14 Feb 2011 11:00:08 +0100
5 Message-ID: <1297677612-12405-2-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:00:34 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:00:34 +0100
19 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
20 id S1752908Ab1BNKA1 (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>);
21 Mon, 14 Feb 2011 05:00:27 -0500
22 Received: from server103.greatnet.de ([83.133.97.6]:38321 "EHLO
23 server103.greatnet.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
24 with ESMTP id S1752778Ab1BNKAX (ORCPT
25 <rfc822;linux-kernel@vger.kernel.org>);
26 Mon, 14 Feb 2011 05:00:23 -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 1AFC7950DB3;
31 Mon, 14 Feb 2011 10:59:06 +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/1099646>
40 The only caller of enable_IR_x2apic() is probe_64.c, which is only
41 compiled on x86-64 bit machines.
42 This function causes compilation problems on 32-bit machines with no
43 io-apic enabled, so we remove it from 32s and keep the way it was on 64s.
45 Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
47 arch/x86/include/asm/apic.h | 2 ++
48 arch/x86/kernel/apic/apic.c | 2 +-
49 2 files changed, 3 insertions(+), 1 deletions(-)
51 diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
52 index b8a3484..b1d77e1 100644
53 --- a/arch/x86/include/asm/apic.h
54 +++ b/arch/x86/include/asm/apic.h
55 @@ -216,7 +216,9 @@ static inline void x2apic_force_phys(void)
56 #define x2apic_supported() 0
60 extern void enable_IR_x2apic(void);
63 extern int get_physical_broadcast(void);
65 diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
66 index 306386f..27a7497 100644
67 --- a/arch/x86/kernel/apic/apic.c
68 +++ b/arch/x86/kernel/apic/apic.c
69 @@ -1467,6 +1467,7 @@ int __init enable_IR(void)
74 void __init enable_IR_x2apic(void)
77 @@ -1540,7 +1541,6 @@ out:
78 pr_info("Not enabling x2apic, Intr-remapping init failed.\n");
83 * Detect and enable local APICs on non-SMP boards.
84 * Original code written by Keir Fraser.