Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / arch / x86 / kernel / rtc.c

diff --git a/arch/x86/kernel/rtc.c b/arch/x86/kernel/rtc.c
index bf67dcb..1cfbbfc 100644 (file)
--- a/arch/x86/kernel/rtc.c
+++ b/arch/x86/kernel/rtc.c
@@ -8,6 +8,7 @@
 #include <linux/pnp.h>
 
 #include <asm/vsyscall.h>
+#include <asm/x86_init.h>
 #include <asm/time.h>
 
 #ifdef CONFIG_X86_32
@@ -165,13 +166,13 @@ void rtc_cmos_write(unsigned char val, unsigned char addr)
 }
 EXPORT_SYMBOL(rtc_cmos_write);
 
-static int set_rtc_mmss(unsigned long nowtime)
+int update_persistent_clock(struct timespec now)
 {
        unsigned long flags;
        int retval;
 
        spin_lock_irqsave(&rtc_lock, flags);
-       retval = set_wallclock(nowtime);
+       retval = x86_platform.set_wallclock(now.tv_sec);
        spin_unlock_irqrestore(&rtc_lock, flags);
 
        return retval;
@@ -183,18 +184,13 @@ void read_persistent_clock(struct timespec *ts)
        unsigned long retval, flags;
 
        spin_lock_irqsave(&rtc_lock, flags);
-       retval = get_wallclock();
+       retval = x86_platform.get_wallclock();
        spin_unlock_irqrestore(&rtc_lock, flags);
 
        ts->tv_sec = retval;
        ts->tv_nsec = 0;
 }
 
-int update_persistent_clock(struct timespec now)
-{
-       return set_rtc_mmss(now.tv_sec);
-}
-
 unsigned long long native_read_tsc(void)
 {
        return __native_read_tsc();