aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/ppc/kernel/idle.c2
-rw-r--r--arch/ppc64/kernel/maple_time.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/ppc/kernel/idle.c b/arch/ppc/kernel/idle.c
index 0a12fbef7347..11e5b44713f7 100644
--- a/arch/ppc/kernel/idle.c
+++ b/arch/ppc/kernel/idle.c
@@ -75,7 +75,7 @@ void cpu_idle(void)
75/* 75/*
76 * Register the sysctl to set/clear powersave_nap. 76 * Register the sysctl to set/clear powersave_nap.
77 */ 77 */
78extern unsigned long powersave_nap; 78extern int powersave_nap;
79 79
80static ctl_table powersave_nap_ctl_table[]={ 80static ctl_table powersave_nap_ctl_table[]={
81 { 81 {
diff --git a/arch/ppc64/kernel/maple_time.c b/arch/ppc64/kernel/maple_time.c
index cf5186335900..445cb7470bf5 100644
--- a/arch/ppc64/kernel/maple_time.c
+++ b/arch/ppc64/kernel/maple_time.c
@@ -172,7 +172,7 @@ unsigned long __init maple_get_boot_time(void)
172 } 172 }
173 173
174 maple_get_rtc_time(&tm); 174 maple_get_rtc_time(&tm);
175 return mktime(time->tm_year+1900, time->tm_mon+1, time->tm_mday, 175 return mktime(tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday,
176 time->tm_hour, time->tm_min, time->tm_sec); 176 tm.tm_hour, tm.tm_min, tm.tm_sec);
177} 177}
178 178