From f9653d49122fc215c2adc1be2c3681eed50d46d3 Mon Sep 17 00:00:00 2001
From: John Stultz <john.stultz@linaro.org>
Date: Tue, 21 Aug 2012 20:30:49 -0400
Subject: [PATCH] --- yaml --- r: 322175 b: refs/heads/master c:
 bf2ac312195155511a0f79325515cbb61929898a h: refs/heads/master i:   322173:
 2972a7a8244e007c2ace7de7b403538163e445d9   322171:
 08c36d4ef27809dfa96337cf2b2d5a62b1d1f618   322167:
 e58fe454664ae4596e9cd3815e22e8767e69555f   322159:
 741406dfb29d43a4a9f7c52680b81d33f2257b98   322143:
 ccc5bfd0da14fefcf578fa802c9ecc4c0dcd6b2e   322111:
 f2ed3ece288bd20003cdd3b27134e74d09c2bf34   322047:
 27b0e523df4658ba9565de27ac71978c0533e2b2 v: v3

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

diff --git a/[refs] b/[refs]
index c8869c34c5ae..e89337cac05a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ea565a9be32a3c8d1092017686f183b6d8c4514
+refs/heads/master: bf2ac312195155511a0f79325515cbb61929898a
diff --git a/trunk/kernel/time/timekeeping.c b/trunk/kernel/time/timekeeping.c
index a5a9389c4c30..0c1485e42be6 100644
--- a/trunk/kernel/time/timekeeping.c
+++ b/trunk/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,