UBUNTU: Ubuntu-raspi2-4.10.0-1003.5

[mirror_ubuntu-zesty-kernel.git] / kernel / time / tick-sched.c

diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index 74e0388cc88d4d17b340d102ec8e053257d6ef55..2c115fdab39765f4ecbeaade9fa74008e711d08a 100644 (file)
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -767,7 +767,7 @@ static ktime_t tick_nohz_stop_sched_tick(struct tick_sched *ts,
        tick = expires;
 
        /* Skip reprogram of event if its not changed */
-       if (ts->tick_stopped && (expires == ts->next_tick))
+       if (ts->tick_stopped && (expires == dev->next_event))
                goto out;
 
        /*
@@ -787,8 +787,6 @@ static ktime_t tick_nohz_stop_sched_tick(struct tick_sched *ts,
                trace_tick_stop(1, TICK_DEP_MASK_NONE);
        }
 
-       ts->next_tick = tick;
-
        /*
         * If the expiration time == KTIME_MAX, then we simply stop
         * the tick timer.
@@ -804,10 +802,7 @@ static ktime_t tick_nohz_stop_sched_tick(struct tick_sched *ts,
        else
                tick_program_event(tick, 1);
 out:
-       /*
-        * Update the estimated sleep length until the next timer
-        * (not only the tick).
-        */
+       /* Update the estimated sleep length */
        ts->sleep_length = ktime_sub(dev->next_event, now);
        return tick;
 }