From 86d2bb2141139db7315b74495360d320d6ec2ccc Mon Sep 17 00:00:00 2001
From: John Stultz <john.stultz@linaro.org>
Date: Tue, 21 Aug 2012 20:30:46 -0400
Subject: [PATCH] --- yaml --- r: 322172 b: refs/heads/master c:
 784ffcbb96c3a97b4c64fd48b1dfe12ef3fcbcda h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 15a012579332..ad1c6b4c5667 100644
--- 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
index 898bef066a44..258164ae45cc 100644
--- 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)