Browse Source

sh: Account for INITIAL_JIFFIES when using jiffies clocksource.

In the case where we fall back on the generic jiffies clocksource,
INITIAL_JIFFIES needs to be accounted for so that printk times aren't
completely skewed.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Paul Mundt 16 years ago
parent
commit
780f98ff1f
1 changed files with 1 additions and 1 deletions
  1. 1 1
      arch/sh/kernel/time.c

+ 1 - 1
arch/sh/kernel/time.c

@@ -104,7 +104,7 @@ unsigned long long sched_clock(void)
 
 
 	/* jiffies based sched_clock if no clocksource is installed */
 	/* jiffies based sched_clock if no clocksource is installed */
 	if (!clocksource_sh.rating)
 	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);
 	cycles = clocksource_sh.read(&clocksource_sh);
 	return cyc2ns(&clocksource_sh, cycles);
 	return cyc2ns(&clocksource_sh, cycles);