From e4ef5b3d512483416639b141d7e70f041d405a12 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 11 May 2009 12:15:14 +0900
Subject: [PATCH] --- yaml --- r: 146772 b: refs/heads/master c:
 780f98ff1fa9cfcab177f6b5ab09b11321f1e5c8 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index a26addd26bbc..5f9066960da8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9d674e50007362567edb5df65c05dd56a5964bf
+refs/heads/master: 780f98ff1fa9cfcab177f6b5ab09b11321f1e5c8
diff --git a/trunk/arch/sh/kernel/time.c b/trunk/arch/sh/kernel/time.c
index e0aa769481ff..a77838f539f8 100644
--- a/trunk/arch/sh/kernel/time.c
+++ b/trunk/arch/sh/kernel/time.c
@@ -104,7 +104,7 @@ unsigned long long sched_clock(void)
 
 	/* jiffies based sched_clock if no clocksource is installed */
 	if (!clocksource_sh.rating)
-		return (unsigned long long)jiffies * (NSEC_PER_SEC / HZ);
+		return (jiffies_64 - INITIAL_JIFFIES) * (NSEC_PER_SEC / HZ);
 
 	cycles = clocksource_sh.read(&clocksource_sh);
 	return cyc2ns(&clocksource_sh, cycles);