diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-05-11 05:15:14 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-05-11 05:15:14 +0200 |
| commit | 780f98ff1fa9cfcab177f6b5ab09b11321f1e5c8 (patch) | |
| tree | 2252bc0f9c1abf04262e4899a62b281beeb90674 /arch/sh/kernel/time.c | |
| parent | sh: Fix up typo in arch/sh/kernel/vmlinux.lds.S (diff) | |
| download | linux-780f98ff1fa9cfcab177f6b5ab09b11321f1e5c8.tar.xz linux-780f98ff1fa9cfcab177f6b5ab09b11321f1e5c8.zip | |
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>
Diffstat (limited to 'arch/sh/kernel/time.c')
| -rw-r--r-- | arch/sh/kernel/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c index e0aa769481ff..a77838f539f8 100644 --- a/arch/sh/kernel/time.c +++ b/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); |