Messages in this thread Patch in this message | | | Date | Mon, 18 May 2009 18:55:53 +0200 | From | Ingo Molnar <> | Subject | [GIT PULL, v2] scheduler fixes |
| |
Linus,
Please pull the latest sched-fixes-for-linus-2 git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git sched-fixes-for-linus-2
This excludes the "sched: avoid flexible array member inside struct (gcc extension)" commit you objected to. Did a test-build and a test-boot of this, just in case...
Thanks,
Ingo
------------------> Ron (1): sched: Fix fallback sched_clock()'s offset when using jiffies
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;
| |