From aafc6fc2574c9f1d441168483e1d163858ca5f10 Mon Sep 17 00:00:00 2001
From: Michael Ellerman <michael@ellerman.id.au>
Date: Thu, 7 Jul 2005 17:56:31 -0700
Subject: [PATCH] --- yaml --- r: 4239 b: refs/heads/master c:
 08d5e3eb4b2141e1031835c89a62ee3ddf896641 h: refs/heads/master i:   4237:
 ea799289a95cea0c2c6be8a5fc3ab0ec05f28262   4235:
 fb60b459c5cc5d79ef592a10406ea8cc06c7a6f3   4231:
 10fcd25bfea481445ad4d837fd16024e13e16406   4223:
 15d672f9580706ce44613224eba0f16379f6e6b6 v: v3

---
 [refs]                         |  2 +-
 trunk/arch/ppc64/kernel/idle.c | 41 ----------------------------------
 2 files changed, 1 insertion(+), 42 deletions(-)

diff --git a/[refs] b/[refs]
index 79213d76cfbc..8550692d856a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62d60e9f0f890c31e5a83a7d8ecdfd1c7975fdb9
+refs/heads/master: 08d5e3eb4b2141e1031835c89a62ee3ddf896641
diff --git a/trunk/arch/ppc64/kernel/idle.c b/trunk/arch/ppc64/kernel/idle.c
index 69b7c22bad54..b8cfb37e5f14 100644
--- a/trunk/arch/ppc64/kernel/idle.c
+++ b/trunk/arch/ppc64/kernel/idle.c
@@ -37,8 +37,6 @@
 
 extern void power4_idle(void);
 
-static int (*idle_loop)(void);
-
 int default_idle(void)
 {
 	long oldval;
@@ -127,42 +125,3 @@ register_powersave_nap_sysctl(void)
 }
 __initcall(register_powersave_nap_sysctl);
 #endif
-
-int idle_setup(void)
-{
-	/*
-	 * Move that junk to each platform specific file, eventually define
-	 * a pSeries_idle for shared processor stuff
-	 */
-#ifdef CONFIG_PPC_ISERIES
-	idle_loop = iSeries_idle;
-	return 1;
-#else
-	idle_loop = default_idle;
-#endif
-#ifdef CONFIG_PPC_PSERIES
-	if (systemcfg->platform & PLATFORM_PSERIES) {
-		if (cur_cpu_spec->firmware_features & FW_FEATURE_SPLPAR) {
-			if (get_paca()->lppaca.shared_proc) {
-				printk(KERN_INFO "Using shared processor idle loop\n");
-				idle_loop = shared_idle;
-			} else {
-				printk(KERN_INFO "Using dedicated idle loop\n");
-				idle_loop = dedicated_idle;
-			}
-		} else {
-			printk(KERN_INFO "Using default idle loop\n");
-			idle_loop = default_idle;
-		}
-	}
-#endif /* CONFIG_PPC_PSERIES */
-#ifndef CONFIG_PPC_ISERIES
-	if (systemcfg->platform == PLATFORM_POWERMAC ||
-	    systemcfg->platform == PLATFORM_MAPLE) {
-		printk(KERN_INFO "Using native/NAP idle loop\n");
-		idle_loop = native_idle;
-	}
-#endif /* CONFIG_PPC_ISERIES */
-
-	return 1;
-}