[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-bf2ac312195155511a0f79325515cbb61929898a@git.kernel.org>
Date: Wed, 22 Aug 2012 01:52:59 -0700
From: tip-bot for John Stultz <john.stultz@...aro.org>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, john.stultz@...aro.org,
hpa@...or.com, mingo@...nel.org, tglx@...utronix.de,
prarit@...hat.com
Subject: [tip:timers/urgent] time: Avoid making adjustments if we haven'
t accumulated anything
Commit-ID: bf2ac312195155511a0f79325515cbb61929898a
Gitweb: http://git.kernel.org/tip/bf2ac312195155511a0f79325515cbb61929898a
Author: John Stultz <john.stultz@...aro.org>
AuthorDate: Tue, 21 Aug 2012 20:30:49 -0400
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitDate: Wed, 22 Aug 2012 10:42:13 +0200
time: Avoid making adjustments if we haven't accumulated anything
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
CLOCK_REALTIME_COARSE/CLOCK_MONOTONIC_COARSE.
Signed-off-by: John Stultz <john.stultz@...aro.org>
Cc: Prarit Bhargava <prarit@...hat.com>
Cc: Ingo Molnar <mingo@...nel.org>
Cc: stable@...r.kernel.org
Link: http://lkml.kernel.org/r/1345595449-34965-5-git-send-email-john.stultz@linaro.org
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
kernel/time/timekeeping.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index a5a9389..0c1485e 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -1152,6 +1152,10 @@ static void update_wall_time(void)
offset = (clock->read(clock) - clock->cycle_last) & clock->mask;
#endif
+ /* Check if there's really nothing to do */
+ if (offset < tk->cycle_interval)
+ goto out;
+
/*
* With NO_HZ we may have to accumulate many cycle_intervals
* (think "ticks") worth of time at once. To do this efficiently,
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists