From 19c7dfccfdca174cc92f2b0d4ccede11b7480953 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Mon, 22 Sep 2008 18:56:01 +0200
Subject: [PATCH] --- yaml --- r: 109977 b: refs/heads/master c:
 49d670fb8dd62d3ed4e3ed2513538ea65b051aed h: refs/heads/master i:   109975:
 20da3b3ea9a87168abcf729b10dda021ab892f60 v: v3

---
 [refs]                         | 2 +-
 trunk/kernel/time/tick-sched.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

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);
 }