diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-29 05:04:24 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-29 05:04:24 -0400 |
| commit | 42f1d2e06a25628ae4ceaadccc4fa67c7787e2b4 (patch) | |
| tree | 8aac83e399de7ad13748a59853a0feea9ed2c5cb /kernel/sched_clock.c | |
| parent | 9af5324a070e0b2dcb6e22c89e17424eba245fcc (diff) | |
| parent | 77bbca138c64cb80259732db6f70e1668123f2a7 (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci into devel
Diffstat (limited to 'kernel/sched_clock.c')
| -rw-r--r-- | kernel/sched_clock.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/sched_clock.c b/kernel/sched_clock.c index 819f17ac796e..e1d16c9a7680 100644 --- a/kernel/sched_clock.c +++ b/kernel/sched_clock.c | |||
| @@ -38,7 +38,8 @@ | |||
| 38 | */ | 38 | */ |
| 39 | unsigned long long __attribute__((weak)) sched_clock(void) | 39 | unsigned long long __attribute__((weak)) sched_clock(void) |
| 40 | { | 40 | { |
| 41 | return (unsigned long long)jiffies * (NSEC_PER_SEC / HZ); | 41 | return (unsigned long long)(jiffies - INITIAL_JIFFIES) |
| 42 | * (NSEC_PER_SEC / HZ); | ||
| 42 | } | 43 | } |
| 43 | 44 | ||
| 44 | static __read_mostly int sched_clock_running; | 45 | static __read_mostly int sched_clock_running; |