Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 4239
b: refs/heads/master
c: 08d5e3e
h: refs/heads/master
i:
  4237: ea79928
  4235: fb60b45
  4231: 10fcd25
  4223: 15d672f
v: v3
  • Loading branch information
Michael Ellerman authored and Linus Torvalds committed Jul 8, 2005
1 parent db63c92 commit aafc6fc
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 42 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 62d60e9f0f890c31e5a83a7d8ecdfd1c7975fdb9
refs/heads/master: 08d5e3eb4b2141e1031835c89a62ee3ddf896641
41 changes: 0 additions & 41 deletions trunk/arch/ppc64/kernel/idle.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@

extern void power4_idle(void);

static int (*idle_loop)(void);

int default_idle(void)
{
long oldval;
Expand Down Expand Up @@ -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;
}

0 comments on commit aafc6fc

Please sign in to comment.