---

yaml --- r: 322172 b: refs/heads/master c: 784ffcb h: refs/heads/master v: v3
git-mirror · Aug 22, 2012 · 86d2bb2 · 86d2bb2
1 parent 08c36d4
commit 86d2bb2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e8b14526ca7fb046a81c94002c1c43b6fdf0e9b
+refs/heads/master: 784ffcbb96c3a97b4c64fd48b1dfe12ef3fcbcda
diff --git a/trunk/kernel/time/timekeeping.c b/trunk/kernel/time/timekeeping.c
@@ -115,6 +115,7 @@ static void tk_xtime_add(struct timekeeper *tk, const struct timespec *ts)
 {
 	tk->xtime_sec += ts->tv_sec;
 	tk->xtime_nsec += (u64)ts->tv_nsec << tk->shift;
+	tk_normalize_xtime(tk);
 }
 
 static void tk_set_wall_to_mono(struct timekeeper *tk, struct timespec wtm)