Commit-ID: 92d23f703c608fcb2c8edd74a3fd0f4031e18606
Gitweb: http://git.kernel.org/tip/92d23f703c608fcb2c8edd74a3fd0f4031e18606
Author: Ron <ron@xxxxxxxxxxxxxxx>
AuthorDate: Fri, 8 May 2009 22:54:49 +0930
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Sat, 9 May 2009 10:08:19 +0200
sched: Fix fallback sched_clock()'s offset when using jiffies
Account for the initial offset to the jiffy count.
[ Impact: fix printk timestamps on architectures using fallback sched_clock() ]
Signed-off-by: Ron Lee <ron@xxxxxxxxxx>
Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
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 819f17a..e1d16c9 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;
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|