diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-11 18:50:45 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-11 18:50:45 +0200 |
| commit | 5b16a2212f1840b63d6cc476b26ff9349dab185e (patch) | |
| tree | 1fc6fbc12ff101f6067edd00242475290b364684 /kernel | |
| parent | b922df7383749a1c0b7ea64c50fa839263d3816b (diff) | |
| parent | 5b7dba4ff834259a5623e03a565748704a8fe449 (diff) | |
| download | linux-5b16a2212f1840b63d6cc476b26ff9349dab185e.tar.gz linux-5b16a2212f1840b63d6cc476b26ff9349dab185e.tar.bz2 linux-5b16a2212f1840b63d6cc476b26ff9349dab185e.zip | |
Merge branch 'sched/clock' into sched/urgent
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched_clock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/sched_clock.c b/kernel/sched_clock.c index e8ab096ddfe3..81787248b60f 100644 --- a/kernel/sched_clock.c +++ b/kernel/sched_clock.c @@ -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); |