---

yaml --- r: 322174 b: refs/heads/master c: 6ea565a h: refs/heads/master v: v3
git-mirror · Aug 22, 2012 · 4d40c8a · 4d40c8a
1 parent 2972a7a
commit 4d40c8a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85dc8f05c93c8105987de9d7e7cebf15a72ff4ec
+refs/heads/master: 6ea565a9be32a3c8d1092017686f183b6d8c4514
diff --git a/trunk/kernel/time/timekeeping.c b/trunk/kernel/time/timekeeping.c
@@ -1184,9 +1184,9 @@ static void update_wall_time(void)
 	* the vsyscall implementations are converted to use xtime_nsec
 	* (shifted nanoseconds), this can be killed.
 	*/
-	remainder = tk->xtime_nsec & ((1 << tk->shift) - 1);
+	remainder = tk->xtime_nsec & ((1ULL << tk->shift) - 1);
 	tk->xtime_nsec -= remainder;
-	tk->xtime_nsec += 1 << tk->shift;
+	tk->xtime_nsec += 1ULL << tk->shift;
 	tk->ntp_error += remainder << tk->ntp_error_shift;
 
 	/*