diff options
| author | James Morris <jmorris@namei.org> | 2009-05-22 18:40:59 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-05-22 18:40:59 +1000 |
| commit | 2c9e703c618106f5383226fbb1f526cb11034f8a (patch) | |
| tree | 87d7548001ea82f655fede0640466fc16aabcdf7 /kernel/sched_clock.c | |
| parent | 6470c077cae12227318f40f3e6d756caadcce4b0 (diff) | |
| parent | 5805977e63a36ad56594a623f3bd2bebcb7db233 (diff) | |
Merge branch 'master' into next
Conflicts:
fs/exec.c
Removed IMA changes (the IMA checks are now performed via may_open()).
Signed-off-by: James Morris <jmorris@namei.org>
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 819f17ac796..e1d16c9a768 100644 --- a/kernel/sched_clock.c +++ b/kernel/sched_clock.c @@ -38,7 +38,8 @@ */ unsigned long long __attribute__((weak)) sched_clock(void) { - return (unsigned long long)jiffies * (NSEC_PER_SEC / HZ); + return (unsigned long long)(jiffies - INITIAL_JIFFIES) + * (NSEC_PER_SEC / HZ); } static __read_mostly int sched_clock_running; |