---

yaml --- r: 322175 b: refs/heads/master c: bf2ac31 h: refs/heads/master i: 322173: 2972a7a 322171: 08c36d4 322167: e58fe45 322159: 741406d 322143: ccc5bfd 322111: f2ed3ec 322047: 27b0e52 v: v3
git-mirror · Aug 22, 2012 · f9653d4 · f9653d4
1 parent 4d40c8a
commit f9653d4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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,