diff options
author | Michael Ellerman <michael@ellerman.id.au> | 2005-07-07 20:56:31 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-07 21:23:41 -0400 |
commit | 08d5e3eb4b2141e1031835c89a62ee3ddf896641 (patch) | |
tree | f94edd066fc7e2b554a93812bb1938f6374178e0 | |
parent | 62d60e9f0f890c31e5a83a7d8ecdfd1c7975fdb9 (diff) |
[PATCH] ppc64: Remove obsolete idle_setup()
Now that the idle loop is configured by each platform we don't need
idle_setup() anymore.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | arch/ppc64/kernel/idle.c | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/arch/ppc64/kernel/idle.c b/arch/ppc64/kernel/idle.c index 69b7c22bad54..b8cfb37e5f14 100644 --- a/arch/ppc64/kernel/idle.c +++ b/arch/ppc64/kernel/idle.c | |||
@@ -37,8 +37,6 @@ | |||
37 | 37 | ||
38 | extern void power4_idle(void); | 38 | extern void power4_idle(void); |
39 | 39 | ||
40 | static int (*idle_loop)(void); | ||
41 | |||
42 | int default_idle(void) | 40 | int default_idle(void) |
43 | { | 41 | { |
44 | long oldval; | 42 | long oldval; |
@@ -127,42 +125,3 @@ register_powersave_nap_sysctl(void) | |||
127 | } | 125 | } |
128 | __initcall(register_powersave_nap_sysctl); | 126 | __initcall(register_powersave_nap_sysctl); |
129 | #endif | 127 | #endif |
130 | |||
131 | int idle_setup(void) | ||
132 | { | ||
133 | /* | ||
134 | * Move that junk to each platform specific file, eventually define | ||
135 | * a pSeries_idle for shared processor stuff | ||
136 | */ | ||
137 | #ifdef CONFIG_PPC_ISERIES | ||
138 | idle_loop = iSeries_idle; | ||
139 | return 1; | ||
140 | #else | ||
141 | idle_loop = default_idle; | ||
142 | #endif | ||
143 | #ifdef CONFIG_PPC_PSERIES | ||
144 | if (systemcfg->platform & PLATFORM_PSERIES) { | ||
145 | if (cur_cpu_spec->firmware_features & FW_FEATURE_SPLPAR) { | ||
146 | if (get_paca()->lppaca.shared_proc) { | ||
147 | printk(KERN_INFO "Using shared processor idle loop\n"); | ||
148 | idle_loop = shared_idle; | ||
149 | } else { | ||
150 | printk(KERN_INFO "Using dedicated idle loop\n"); | ||
151 | idle_loop = dedicated_idle; | ||
152 | } | ||
153 | } else { | ||
154 | printk(KERN_INFO "Using default idle loop\n"); | ||
155 | idle_loop = default_idle; | ||
156 | } | ||
157 | } | ||
158 | #endif /* CONFIG_PPC_PSERIES */ | ||
159 | #ifndef CONFIG_PPC_ISERIES | ||
160 | if (systemcfg->platform == PLATFORM_POWERMAC || | ||
161 | systemcfg->platform == PLATFORM_MAPLE) { | ||
162 | printk(KERN_INFO "Using native/NAP idle loop\n"); | ||
163 | idle_loop = native_idle; | ||
164 | } | ||
165 | #endif /* CONFIG_PPC_ISERIES */ | ||
166 | |||
167 | return 1; | ||
168 | } | ||