aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc64/kernel/idle.c
diff options
context:
space:
mode:
authorMichael Ellerman <michael@ellerman.id.au>2005-07-07 20:56:28 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-07 21:23:40 -0400
commitfd899c0cc725387992ccfc83fb6f70505c36cbeb (patch)
tree0de5d3960c7e7247638c962d7913acec1ce2e9fe /arch/ppc64/kernel/idle.c
parent88de0be0c7335650326a1236bf6ca1ed265c0a1c (diff)
[PATCH] ppc64: Make idle_loop a ppc_md function
This patch adds an idle member to the ppc_md structure and calls it from cpu_idle(). If a platform leaves ppc_md.idle as null it will get the default idle loop default_idle(). 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>
Diffstat (limited to 'arch/ppc64/kernel/idle.c')
-rw-r--r--arch/ppc64/kernel/idle.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/ppc64/kernel/idle.c b/arch/ppc64/kernel/idle.c
index 08952c7e6216..e270055e73e2 100644
--- a/arch/ppc64/kernel/idle.c
+++ b/arch/ppc64/kernel/idle.c
@@ -33,6 +33,7 @@
33#include <asm/iSeries/ItLpQueue.h> 33#include <asm/iSeries/ItLpQueue.h>
34#include <asm/plpar_wrappers.h> 34#include <asm/plpar_wrappers.h>
35#include <asm/systemcfg.h> 35#include <asm/systemcfg.h>
36#include <asm/machdep.h>
36 37
37extern void power4_idle(void); 38extern void power4_idle(void);
38 39
@@ -122,7 +123,7 @@ static int iSeries_idle(void)
122 123
123#else 124#else
124 125
125static int default_idle(void) 126int default_idle(void)
126{ 127{
127 long oldval; 128 long oldval;
128 unsigned int cpu = smp_processor_id(); 129 unsigned int cpu = smp_processor_id();
@@ -288,7 +289,7 @@ static int shared_idle(void)
288 289
289#endif /* CONFIG_PPC_PSERIES */ 290#endif /* CONFIG_PPC_PSERIES */
290 291
291static int native_idle(void) 292int native_idle(void)
292{ 293{
293 while(1) { 294 while(1) {
294 /* check CPU type here */ 295 /* check CPU type here */
@@ -308,7 +309,8 @@ static int native_idle(void)
308 309
309void cpu_idle(void) 310void cpu_idle(void)
310{ 311{
311 idle_loop(); 312 BUG_ON(NULL == ppc_md.idle_loop);
313 ppc_md.idle_loop();
312} 314}
313 315
314int powersave_nap; 316int powersave_nap;