diff --git a/[refs] b/[refs] index 4d3ee9840d56..0815b3c88305 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4faac97d44ac27bdbb010a9c3597401a8f89341f +refs/heads/master: 49d670fb8dd62d3ed4e3ed2513538ea65b051aed diff --git a/trunk/kernel/time/tick-sched.c b/trunk/kernel/time/tick-sched.c index 31a14e8caac1..39019b3f7621 100644 --- a/trunk/kernel/time/tick-sched.c +++ b/trunk/kernel/time/tick-sched.c @@ -75,6 +75,9 @@ static void tick_do_update_jiffies64(ktime_t now) incr * ticks); } do_timer(++ticks); + + /* Keep the tick_next_period variable up to date */ + tick_next_period = ktime_add(last_jiffies_update, tick_period); } write_sequnlock(&xtime_lock); }