[2/3] 2.6.35.y: time: Avoid making adjustments if we haven't accumulated anything

Message ID 1347928580-22833-3-git-send-email-john.stultz@linaro.org
State Accepted
Headers show

Commit Message

John Stultz Sept. 18, 2012, 12:36 a.m.
This is a -stable backport of bf2ac312195155511a0f79325515cbb61929898a

If update_wall_time() is called and the current offset isn't large
enough to accumulate, avoid re-calling timekeeping_adjust which may
change the clock freq and can cause 1ns inconsistencies with

Signed-off-by: John Stultz <john.stultz@linaro.org>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: stable@vger.kernel.org
Link: http://lkml.kernel.org/r/1345595449-34965-5-git-send-email-john.stultz@linaro.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <john.stultz@linaro.org>
 kernel/time/timekeeping.c |    4 ++++
 1 file changed, 4 insertions(+)


diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 4f760d4..ae27d69 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -842,6 +842,10 @@  void update_wall_time(void)
 	offset = timekeeper.cycle_interval;
+	/* Check if there's really nothing to do */
+	if (offset < timekeeper.cycle_interval)
+		return;
 	timekeeper.xtime_nsec = (s64)xtime.tv_nsec << timekeeper.shift;