diff options
author | Paul Mackerras <paulus@samba.org> | 2006-03-26 23:03:03 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-03-26 23:03:03 -0500 |
commit | a0652fc9a28c3ef8cd59264bfcb089c44d1b0e06 (patch) | |
tree | a28527b65237b3067553a993f5ad06dfb24df044 /arch/powerpc/platforms | |
parent | 55aab8cd3a498201b769a19de861c77516bdfd45 (diff) |
powerpc: Unify the 32 and 64 bit idle loops
This unifies the 32-bit (ARCH=ppc and ARCH=powerpc) and 64-bit idle
loops. It brings over the concept of having a ppc_md.power_save
function from 32-bit to ARCH=powerpc, which lets us get rid of
native_idle(). With this we will also be able to simplify the idle
handling for pSeries and cell.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms')
-rw-r--r-- | arch/powerpc/platforms/maple/setup.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/powermac/setup.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c index ec5c1e10c407..137d6063182b 100644 --- a/arch/powerpc/platforms/maple/setup.c +++ b/arch/powerpc/platforms/maple/setup.c | |||
@@ -290,7 +290,7 @@ struct machdep_calls __initdata maple_md = { | |||
290 | .get_rtc_time = maple_get_rtc_time, | 290 | .get_rtc_time = maple_get_rtc_time, |
291 | .calibrate_decr = generic_calibrate_decr, | 291 | .calibrate_decr = generic_calibrate_decr, |
292 | .progress = maple_progress, | 292 | .progress = maple_progress, |
293 | .idle_loop = native_idle, | 293 | .power_save = power4_idle, |
294 | #ifdef CONFIG_KEXEC | 294 | #ifdef CONFIG_KEXEC |
295 | .machine_kexec = default_machine_kexec, | 295 | .machine_kexec = default_machine_kexec, |
296 | .machine_kexec_prepare = default_machine_kexec_prepare, | 296 | .machine_kexec_prepare = default_machine_kexec_prepare, |
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c index 385aab90c4d2..c2696d00672a 100644 --- a/arch/powerpc/platforms/powermac/setup.c +++ b/arch/powerpc/platforms/powermac/setup.c | |||
@@ -733,7 +733,7 @@ struct machdep_calls __initdata pmac_md = { | |||
733 | .progress = udbg_progress, | 733 | .progress = udbg_progress, |
734 | #ifdef CONFIG_PPC64 | 734 | #ifdef CONFIG_PPC64 |
735 | .pci_probe_mode = pmac_pci_probe_mode, | 735 | .pci_probe_mode = pmac_pci_probe_mode, |
736 | .idle_loop = native_idle, | 736 | .power_save = power4_idle, |
737 | .enable_pmcs = power4_enable_pmcs, | 737 | .enable_pmcs = power4_enable_pmcs, |
738 | #ifdef CONFIG_KEXEC | 738 | #ifdef CONFIG_KEXEC |
739 | .machine_kexec = default_machine_kexec, | 739 | .machine_kexec = default_machine_kexec, |