From fc3037c01219af1102b53c786c0ff660fdd0f529 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Thu, 28 Aug 2008 17:34:31 -0700
Subject: [PATCH] --- yaml --- r: 113044 b: refs/heads/master c:
 a0b31b578f9ab34826703762113f9d42f3ae9819 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/sparc64/kernel/time.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 800352efa271..e5ff993c66d3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90de9dea3bfb80d0db9e6d1ff26f7ea7b2f1f0f5
+refs/heads/master: a0b31b578f9ab34826703762113f9d42f3ae9819
diff --git a/trunk/arch/sparc64/kernel/time.c b/trunk/arch/sparc64/kernel/time.c
index cc16fdcf98af..184321b88a68 100644
--- a/trunk/arch/sparc64/kernel/time.c
+++ b/trunk/arch/sparc64/kernel/time.c
@@ -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);
 }