2 files changed, 8 insertions, 7 deletions

diff --git a/arch/x86/include/asm/mrst-vrtc.h b/arch/x86/include/asm/mrst-vrtc.h
index 73668abdbedf..1e69a75412a4 100644
--- a/arch/x86/include/asm/mrst-vrtc.h
+++ b/arch/x86/include/asm/mrst-vrtc.h
@@ -3,7 +3,7 @@
 
 extern unsigned char vrtc_cmos_read(unsigned char reg);
 extern void vrtc_cmos_write(unsigned char val, unsigned char reg);
-extern unsigned long vrtc_get_time(void);
-extern int vrtc_set_mmss(unsigned long nowtime);
+extern void vrtc_get_time(struct timespec *now);
+extern int vrtc_set_mmss(const struct timespec *now);
 
 #endif
diff --git a/arch/x86/platform/mrst/vrtc.c b/arch/x86/platform/mrst/vrtc.c
index d62b0a3b5c14..5e355b134ba4 100644
--- a/arch/x86/platform/mrst/vrtc.c
+++ b/arch/x86/platform/mrst/vrtc.c
@@ -56,7 +56,7 @@ void vrtc_cmos_write(unsigned char val, unsigned char reg)
 }
 EXPORT_SYMBOL_GPL(vrtc_cmos_write);
 
-unsigned long vrtc_get_time(void)
+void vrtc_get_time(struct timespec *now)
 {
         u8 sec, min, hour, mday, mon;
         unsigned long flags;
@@ -82,17 +82,18 @@ unsigned long vrtc_get_time(void)
         printk(KERN_INFO "vRTC: sec: %d min: %d hour: %d day: %d "
                 "mon: %d year: %d\n", sec, min, hour, mday, mon, year);
 
-        return mktime(year, mon, mday, hour, min, sec);
+        now->tv_sec = mktime(year, mon, mday, hour, min, sec);
+        now->tv_nsec = 0;
 }
 
-int vrtc_set_mmss(unsigned long nowtime)
+int vrtc_set_mmss(const struct timespec *now)
 {
         unsigned long flags;
         struct rtc_time tm;
         int year;
         int retval = 0;
 
-        rtc_time_to_tm(nowtime, &tm);
+        rtc_time_to_tm(now->tv_sec, &tm);
         if (!rtc_valid_tm(&tm) && tm.tm_year >= 72) {
                 /*
                  * tm.year is the number of years since 1900, and the
@@ -110,7 +111,7 @@ int vrtc_set_mmss(unsigned long nowtime)
         } else {
                 printk(KERN_ERR
                        "%s: Invalid vRTC value: write of %lx to vRTC failed\n",
-                        __FUNCTION__, nowtime);
+                        __FUNCTION__, now->tv_sec);
                 retval = -EINVAL;
         }
         return retval;