diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-19 15:11:21 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-19 15:11:21 +0200 |
| commit | 143a1dec7e04e0a9712ff93e779aabfb21dfd97c (patch) | |
| tree | 3a60a4e630d792fb3cdc6e962ce0ecfd94bb2672 /arch/ppc64/kernel/maple_time.c | |
| parent | ppc: Minor smp changes for consistency with ppc64 (diff) | |
| download | linux-143a1dec7e04e0a9712ff93e779aabfb21dfd97c.tar.xz linux-143a1dec7e04e0a9712ff93e779aabfb21dfd97c.zip | |
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>
Diffstat (limited to 'arch/ppc64/kernel/maple_time.c')
| -rw-r--r-- | arch/ppc64/kernel/maple_time.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/ppc64/kernel/maple_time.c b/arch/ppc64/kernel/maple_time.c index d65210abcd03..cf5186335900 100644 --- a/arch/ppc64/kernel/maple_time.c +++ b/arch/ppc64/kernel/maple_time.c @@ -156,8 +156,9 @@ int maple_set_rtc_time(struct rtc_time *tm) return 0; } -void __init maple_get_boot_time(struct rtc_time *tm) +unsigned long __init maple_get_boot_time(void) { + struct rtc_time tm; struct device_node *rtcs; rtcs = find_compatible_devices("rtc", "pnpPNP,b00"); @@ -170,6 +171,8 @@ void __init maple_get_boot_time(struct rtc_time *tm) "legacy address (0x%x)\n", maple_rtc_addr); } - maple_get_rtc_time(tm); + maple_get_rtc_time(&tm); + return mktime(time->tm_year+1900, time->tm_mon+1, time->tm_mday, + time->tm_hour, time->tm_min, time->tm_sec); } |