sched_clock: prevent scd->clock from moving backwards

[linux-2.6-omap-h63xx.git] / kernel / sched_clock.c

diff --git a/kernel/sched_clock.c b/kernel/sched_clock.c
index e8ab096ddfe399dc3007e32b169b46d02ed9cb48..81787248b60fda5bc58b6231be84a6a54a763cb0 100644 (file)
--- 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);