Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[safe/jmp/linux-2.6] / arch / x86 / kernel / rtc.c

diff --git a/arch/x86/kernel/rtc.c b/arch/x86/kernel/rtc.c
index b8652f2..1cfbbfc 100644 (file)
--- a/arch/x86/kernel/rtc.c
+++ b/arch/x86/kernel/rtc.c
@@ -179,7 +179,7 @@ int update_persistent_clock(struct timespec now)
 }
 
 /* not static: needed by APM */
-unsigned long read_persistent_clock(void)
+void read_persistent_clock(struct timespec *ts)
 {
        unsigned long retval, flags;
 
@@ -187,7 +187,8 @@ unsigned long read_persistent_clock(void)
        retval = x86_platform.get_wallclock();
        spin_unlock_irqrestore(&rtc_lock, flags);
 
-       return retval;
+       ts->tv_sec = retval;
+       ts->tv_nsec = 0;
 }
 
 unsigned long long native_read_tsc(void)