sparc64: Check for RTC class device in update_persistent_clock().
authorDavid S. Miller <davem@davemloft.net>
Fri, 29 Aug 2008 00:34:31 +0000 (17:34 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 29 Aug 2008 21:16:46 +0000 (14:16 -0700)
As we convert the various by-hand sparc64 RTC drivers to use the
generic RTC framework and drivers, we need to keep the NTP
set_rtc_mmss() support via update_persistent_clock() working.

In the end, after all the RTC device cases are converted, this
local set_rtc_mmss() function will be deleted.

Signed-off-by: David S. Miller <davem@davemloft.net>
arch/sparc64/kernel/time.c

index cc16fdc..184321b 100644 (file)
@@ -405,6 +405,11 @@ static unsigned long timer_ticks_per_nsec_quotient __read_mostly;
 
 int update_persistent_clock(struct timespec now)
 {
+       struct rtc_device *rtc = rtc_class_open("rtc0");
+
+       if (rtc)
+               return rtc_set_mmss(rtc, now.tv_sec);
+
        return set_rtc_mmss(now.tv_sec);
 }