---

yaml --- r: 322173 b: refs/heads/master c: 85dc8f0 h: refs/heads/master i: 322171: 08c36d4 v: v3
git-mirror · Aug 22, 2012 · 2972a7a · 2972a7a
1 parent 86d2bb2
commit 2972a7a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 784ffcbb96c3a97b4c64fd48b1dfe12ef3fcbcda
+refs/heads/master: 85dc8f05c93c8105987de9d7e7cebf15a72ff4ec
diff --git a/trunk/kernel/time/timekeeping.c b/trunk/kernel/time/timekeeping.c
@@ -277,7 +277,7 @@ static void timekeeping_forward_now(struct timekeeper *tk)
 	tk->xtime_nsec += cycle_delta * tk->mult;
 
 	/* If arch requires, add in gettimeoffset() */
-	tk->xtime_nsec += arch_gettimeoffset() << tk->shift;
+	tk->xtime_nsec += (u64)arch_gettimeoffset() << tk->shift;
 
 	tk_normalize_xtime(tk);