From 5d65cdefe28beb0a48bce99e7941361988ca5ec6 Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Sun, 1 Nov 2009 19:11:03 +0000
Subject: [PATCH] --- yaml --- r: 168271 b: refs/heads/master c:
 978d7eb31d44de34a7f71e04ed4158f3f854688d h: refs/heads/master i:   168269:
 bf19ccb6658d2df2f9daa57ff3f90ace98e2e562   168267:
 8c1d5f2bdd74cb17d3e49a0fdbc131c4707a8609   168263:
 cfae1b11bab20af38dfdbc3780f1e9941a5781be   168255:
 c7a8ffad72edd31cc777ecafa8ee6bcb3bb47e48 v: v3

---
 [refs]                           |  2 +-
 trunk/arch/powerpc/kernel/time.c | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a9301c15c9a8..0a8b0e834d78 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1167fb318f0ff0bcb9cbb57bb6d16ad450f0cfb
+refs/heads/master: 978d7eb31d44de34a7f71e04ed4158f3f854688d
diff --git a/trunk/arch/powerpc/kernel/time.c b/trunk/arch/powerpc/kernel/time.c
index 92dc844299b6..a136a11c490d 100644
--- a/trunk/arch/powerpc/kernel/time.c
+++ b/trunk/arch/powerpc/kernel/time.c
@@ -777,7 +777,7 @@ int update_persistent_clock(struct timespec now)
 	return ppc_md.set_rtc_time(&tm);
 }
 
-void read_persistent_clock(struct timespec *ts)
+static void __read_persistent_clock(struct timespec *ts)
 {
 	struct rtc_time tm;
 	static int first = 1;
@@ -800,10 +800,23 @@ void read_persistent_clock(struct timespec *ts)
 		return;
 	}
 	ppc_md.get_rtc_time(&tm);
+
 	ts->tv_sec = mktime(tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday,
 			    tm.tm_hour, tm.tm_min, tm.tm_sec);
 }
 
+void read_persistent_clock(struct timespec *ts)
+{
+	__read_persistent_clock(ts);
+
+	/* Sanitize it in case real time clock is set below EPOCH */
+	if (ts->tv_sec < 0) {
+		ts->tv_sec = 0;
+		ts->tv_nsec = 0;
+	}
+		
+}
+
 /* clocksource code */
 static cycle_t rtc_read(struct clocksource *cs)
 {