---

yaml --- r: 288804 b: refs/heads/master c: a078c6d h: refs/heads/master v: v3
git-mirror · Mar 15, 2012 · 21c6894 · 21c6894
1 parent 95cf755
commit 21c6894
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: f910381a55cdaa097030291f272f6e6e4380c39a
+refs/heads/master: a078c6d0e6288fad6d83fb6d5edd91ddb7b6ab33
diff --git a/trunk/kernel/time/ntp.c b/trunk/kernel/time/ntp.c
@@ -289,7 +289,7 @@ static inline s64 ntp_update_offset_fll(s64 offset64, long secs)
 
 	time_status |= STA_MODE;
 
-	return div_s64(offset64 << (NTP_SCALE_SHIFT - SHIFT_FLL), secs);
+	return div64_long(offset64 << (NTP_SCALE_SHIFT - SHIFT_FLL), secs);
 }
 
 static void ntp_update_offset(long offset)