From 24686335eb6c13a4e20e23d2d7218e231f79d0f7 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 28 Jan 2009 13:15:06 +0100
Subject: [PATCH] --- yaml --- r: 136591 b: refs/heads/master c:
 b0b20e5a3a6615ae750804523aeedd32911bb9d6 h: refs/heads/master i:   136589:
 893890955f75607aa7400d888d1eb1baa9158990   136587:
 7d6afca03a39bdfe614d8b67589322289623fa82   136583:
 e1fc1fd50af13b0a03e05704ab3fc0f2aff44e03   136575:
 3200d94ac45d63995c1079fdd3b5eaa743090553 v: v3

---
 [refs]                                   |  2 +-
 trunk/arch/x86/include/asm/es7000/apic.h |  2 ++
 trunk/arch/x86/kernel/es7000_32.c        | 27 ++++++++++++------------
 trunk/arch/x86/mach-generic/es7000.c     |  7 ------
 4 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/[refs] b/[refs]
index b2287739ce20..2b6d54ff1b3d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4904033302c745342e3b3a611881cdee57fbe06a
+refs/heads/master: b0b20e5a3a6615ae750804523aeedd32911bb9d6
diff --git a/trunk/arch/x86/include/asm/es7000/apic.h b/trunk/arch/x86/include/asm/es7000/apic.h
index 717c27f8da61..038c4f0e480b 100644
--- a/trunk/arch/x86/include/asm/es7000/apic.h
+++ b/trunk/arch/x86/include/asm/es7000/apic.h
@@ -36,6 +36,8 @@ static inline unsigned long es7000_check_apicid_present(int bit)
 	return physid_isset(bit, phys_cpu_present_map);
 }
 
+extern void es7000_enable_apic_mode(void);
+
 #define apicid_cluster(apicid) (apicid & 0xF0)
 
 static inline unsigned long calculate_ldr(int cpu)
diff --git a/trunk/arch/x86/kernel/es7000_32.c b/trunk/arch/x86/kernel/es7000_32.c
index 20a2a43c2a9c..e73fe18488ac 100644
--- a/trunk/arch/x86/kernel/es7000_32.c
+++ b/trunk/arch/x86/kernel/es7000_32.c
@@ -359,20 +359,21 @@ es7000_mip_write(struct mip_reg *mip_reg)
 	return status;
 }
 
-void __init
-es7000_sw_apic(void)
+void __init es7000_enable_apic_mode(void)
 {
-	if (es7000_plat) {
-		int mip_status;
-		struct mip_reg es7000_mip_reg;
-
-		printk("ES7000: Enabling APIC mode.\n");
-        	memset(&es7000_mip_reg, 0, sizeof(struct mip_reg));
-        	es7000_mip_reg.off_0 = MIP_SW_APIC;
-        	es7000_mip_reg.off_38 = (MIP_VALID);
-        	while ((mip_status = es7000_mip_write(&es7000_mip_reg)) != 0)
-              		printk("es7000_sw_apic: command failed, status = %x\n",
-				mip_status);
+	struct mip_reg es7000_mip_reg;
+	int mip_status;
+
+	if (!es7000_plat)
 		return;
+
+	printk("ES7000: Enabling APIC mode.\n");
+       	memset(&es7000_mip_reg, 0, sizeof(struct mip_reg));
+       	es7000_mip_reg.off_0 = MIP_SW_APIC;
+       	es7000_mip_reg.off_38 = MIP_VALID;
+
+       	while ((mip_status = es7000_mip_write(&es7000_mip_reg)) != 0) {
+		printk("es7000_enable_apic_mode: command failed, status = %x\n",
+			mip_status);
 	}
 }
diff --git a/trunk/arch/x86/mach-generic/es7000.c b/trunk/arch/x86/mach-generic/es7000.c
index 9acb71120ef6..1185964b7a33 100644
--- a/trunk/arch/x86/mach-generic/es7000.c
+++ b/trunk/arch/x86/mach-generic/es7000.c
@@ -35,13 +35,6 @@ static int probe_es7000(void)
 	return 0;
 }
 
-extern void es7000_sw_apic(void);
-
-static void __init es7000_enable_apic_mode(void)
-{
-	es7000_sw_apic();
-}
-
 static __init int
 mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)
 {