---

yaml --- r: 116351 b: refs/heads/master c: d40e944 h: refs/heads/master i: 116349: fd99c6f 116347: 4fc620d 116343: e51b53d 116335: cbcada4 116319: 2b17ed2 116287: ce40a85 116223: 1b5e16c v: v3
git-mirror · Sep 24, 2008 · 639b340 · 639b340
1 parent 6f261cc
commit 639b340
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5cd1c9c5cf30d4b33df3d3f74d8142f278d536b7
+refs/heads/master: d40e944c25fb4642adb2a4c580a48218a9f3f824
diff --git a/trunk/include/linux/timex.h b/trunk/include/linux/timex.h
@@ -82,7 +82,7 @@
  */
 #define SHIFT_USEC 16		/* frequency offset scale (shift) */
 #define PPM_SCALE (NSEC_PER_USEC << (NTP_SCALE_SHIFT - SHIFT_USEC))
-#define PPM_SCALE_INV_SHIFT 20
+#define PPM_SCALE_INV_SHIFT 19
 #define PPM_SCALE_INV ((1ll << (PPM_SCALE_INV_SHIFT + NTP_SCALE_SHIFT)) / \
 		       PPM_SCALE + 1)
 

diff --git a/trunk/kernel/time/ntp.c b/trunk/kernel/time/ntp.c
@@ -406,9 +406,8 @@ int do_adjtimex(struct timex *txc)
 	if (time_status & (STA_UNSYNC|STA_CLOCKERR))
 		result = TIME_ERROR;
 
-	txc->freq	   = shift_right((s32)(time_freq >> PPM_SCALE_INV_SHIFT) *
-					 (s64)PPM_SCALE_INV,
-					 NTP_SCALE_SHIFT);
+	txc->freq	   = shift_right((time_freq >> PPM_SCALE_INV_SHIFT) *
+					 (s64)PPM_SCALE_INV, NTP_SCALE_SHIFT);
 	txc->maxerror	   = time_maxerror;
 	txc->esterror	   = time_esterror;
 	txc->status	   = time_status;