powerpc: Merge machdep.h

A few things change for consistency between ppc32 and ppc64:
idle functions return void; *_get_boot_time functions return
unsigned long (i.e. time_t) rather than filling in a struct rtc_time
(since that's useful to the callers and easier for pmac to
generate); *_get_rtc_time and *_set_rtc_time functions take
a struct rtc_time; irq_canonicalize is gone; nvram_sync returns
void.

Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 2 insertions, 6 deletions

diff --git a/arch/ppc64/kernel/idle.c b/arch/ppc64/kernel/idle.c
index 954395d42636..8abd2ad92832 100644
--- a/arch/ppc64/kernel/idle.c
+++ b/arch/ppc64/kernel/idle.c
@@ -31,7 +31,7 @@
 
 extern void power4_idle(void);
 
-int default_idle(void)
+void default_idle(void)
 {
         long oldval;
         unsigned int cpu = smp_processor_id();
@@ -64,11 +64,9 @@ int default_idle(void)
                 if (cpu_is_offline(cpu) && system_state == SYSTEM_RUNNING)
                         cpu_die();
         }
-
-        return 0;
 }
 
-int native_idle(void)
+void native_idle(void)
 {
         while (1) {
                 ppc64_runlatch_off();
@@ -85,8 +83,6 @@ int native_idle(void)
                     system_state == SYSTEM_RUNNING)
                         cpu_die();
         }
-
-        return 0;
 }
 
 void cpu_idle(void)