scheduler fixes
Linus,
Please pull the latest sched-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git sched-fixes-for-linus
Thanks,
Ingo
------------------>
Dave Kleikamp (1):
sched_clock: prevent scd->clock from moving backwards
kernel/sched_clock.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
kernel/sched_clock.c +3 -3
@@ -118,13 +118,13 @@ static u64 __update_sched_clock(struct sched_clock_data *scd, u64 now)/* * scd->clock = clamp(scd->tick_gtod + delta, -* max(scd->tick_gtod, scd->clock), -* scd->tick_gtod + TICK_NSEC); +* max(scd->tick_gtod, scd->clock), +* max(scd->clock, scd->tick_gtod + TICK_NSEC)); */ clock = scd->tick_gtod + delta; min_clock =wrap_max (scd->tick_gtod, scd->clock); - max_clock = scd->tick_gtod +TICK_NSEC ; + max_clock =wrap_max (scd->clock, scd->tick_gtod +TICK_NSEC ); clock =wrap_max (clock, min_clock); clock =wrap_min (clock, max_clock);