---

yaml --- r: 146772 b: refs/heads/master c: 780f98f h: refs/heads/master v: v3
git-mirror · May 11, 2009 · e4ef5b3 · e4ef5b3
1 parent 39aec19
commit e4ef5b3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);