From 639b340f8eaee44f9a800d366e311b131a42fb9b Mon Sep 17 00:00:00 2001
From: Roman Zippel <zippel@linux-m68k.org>
Date: Mon, 22 Sep 2008 14:42:44 -0700
Subject: [PATCH] --- yaml --- r: 116351 b: refs/heads/master c:
 d40e944c25fb4642adb2a4c580a48218a9f3f824 h: refs/heads/master i:   116349:
 fd99c6f252d3f9b9f324acdd01b8dd86cbda2221   116347:
 4fc620dbb0b35203eb1e38c9cf89e9abc9d48a67   116343:
 e51b53d6bcd919b6642df71648ee4ab36aa3d3c3   116335:
 cbcada497c7df7a777fb9273f1e84a833c5ac4f7   116319:
 2b17ed2f8c7ab385fb9124c6227f07d4b510ed4c   116287:
 ce40a856199aa924c82f039c7dddac0f32d6ae81   116223:
 1b5e16c2c14c14aae325227df8450215fb52be5a v: v3

---
 [refs]                      | 2 +-
 trunk/include/linux/timex.h | 2 +-
 trunk/kernel/time/ntp.c     | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 4e824684a210..38994c03e7dc 100644
--- 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
index c00bcdd3ae42..9007313b5b71 100644
--- 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
index 450a45cb01c1..ddb0465a6baa 100644
--- 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;