diff options
Diffstat (limited to 'arch/powerpc/kernel/time.c')
-rw-r--r-- | arch/powerpc/kernel/time.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index eae4511ceeac..ad63f30fe3da 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c | |||
@@ -769,7 +769,7 @@ int update_persistent_clock(struct timespec now) | |||
769 | return ppc_md.set_rtc_time(&tm); | 769 | return ppc_md.set_rtc_time(&tm); |
770 | } | 770 | } |
771 | 771 | ||
772 | unsigned long read_persistent_clock(void) | 772 | void read_persistent_clock(struct timespec *ts) |
773 | { | 773 | { |
774 | struct rtc_time tm; | 774 | struct rtc_time tm; |
775 | static int first = 1; | 775 | static int first = 1; |
@@ -787,8 +787,9 @@ unsigned long read_persistent_clock(void) | |||
787 | if (!ppc_md.get_rtc_time) | 787 | if (!ppc_md.get_rtc_time) |
788 | return 0; | 788 | return 0; |
789 | ppc_md.get_rtc_time(&tm); | 789 | ppc_md.get_rtc_time(&tm); |
790 | return mktime(tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday, | 790 | ts->tv_sec = mktime(tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday, |
791 | tm.tm_hour, tm.tm_min, tm.tm_sec); | 791 | tm.tm_hour, tm.tm_min, tm.tm_sec); |
792 | ts->tv_nsec = 0; | ||
792 | } | 793 | } |
793 | 794 | ||
794 | /* clocksource code */ | 795 | /* clocksource code */ |