---

yaml --- r: 311919 b: refs/heads/master c: 4873fa0 h: refs/heads/master i: 311917: d219be7 311915: 96c6f92 311911: 87a001b 311903: ec38232 v: v3
git-mirror · Jul 11, 2012 · c6f00cb · c6f00cb
1 parent 6984a27
commit c6f00cb
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: f55a6faa384304c89cfef162768e88374d3312cb
+refs/heads/master: 4873fa070ae84a4115f0b3c9dfabc224f1bc7c51
diff --git a/trunk/kernel/time/timekeeping.c b/trunk/kernel/time/timekeeping.c
@@ -963,6 +963,8 @@ static cycle_t logarithmic_accumulation(cycle_t offset, int shift)
 		leap = second_overflow(timekeeper.xtime.tv_sec);
 		timekeeper.xtime.tv_sec += leap;
 		timekeeper.wall_to_monotonic.tv_sec -= leap;
+		if (leap)
+			clock_was_set_delayed();
 	}
 
 	/* Accumulate raw time */
@@ -1079,6 +1081,8 @@ static void update_wall_time(void)
 		leap = second_overflow(timekeeper.xtime.tv_sec);
 		timekeeper.xtime.tv_sec += leap;
 		timekeeper.wall_to_monotonic.tv_sec -= leap;
+		if (leap)
+			clock_was_set_delayed();
 	}
 
 	timekeeping_update(false);