[kernel] r14059 - dists/lenny/linux-2.6/debian/patches/bugfix/all

[Dann Frazier]

Author: dannf
Date: Fri Jul 31 06:25:10 2009
New Revision: 14059

Log:
adjusted to apply

Modified:
   dists/lenny/linux-2.6/debian/patches/bugfix/all/ntp-fix-convergence-regression.patch

Modified: dists/lenny/linux-2.6/debian/patches/bugfix/all/ntp-fix-convergence-regression.patch
==============================================================================
--- dists/lenny/linux-2.6/debian/patches/bugfix/all/ntp-fix-convergence-regression.patch	Fri Jul 31 06:10:25 2009	(r14058)
+++ dists/lenny/linux-2.6/debian/patches/bugfix/all/ntp-fix-convergence-regression.patch	Fri Jul 31 06:25:10 2009	(r14059)
@@ -35,18 +35,24 @@
 Signed-off-by: Ingo Molnar <mingo at elte.hu>
 ---
 
-diff --git a/include/linux/timex.h b/include/linux/timex.h
-index aa3475f..0daf961 100644
---- a/include/linux/timex.h
-+++ b/include/linux/timex.h
-@@ -170,17 +170,37 @@ struct timex {
- #include <asm/timex.h>
+Adjusted to apply to Debian's 2.6.26 by dann frazier <dannf at debian.org>
+
+diff -urpN linux-source-2.6.26.orig/include/linux/timex.h linux-source-2.6.26/include/linux/timex.h
+--- linux-source-2.6.26.orig/include/linux/timex.h	2008-07-13 15:51:29.000000000 -0600
++++ linux-source-2.6.26/include/linux/timex.h	2009-07-31 00:23:21.000000000 -0600
+@@ -61,17 +61,37 @@
+ #define NTP_API		4	/* NTP API version */
  
  /*
 - * SHIFT_KG and SHIFT_KF establish the damping of the PLL and are chosen
 - * for a slightly underdamped convergence characteristic. SHIFT_KH
 - * establishes the damping of the FLL and is chosen by wisdom and black
 - * art.
+- *
+- * MAXTC establishes the maximum time constant of the PLL. With the
+- * SHIFT_KG and SHIFT_KF values given and a time constant range from
+- * zero to MAXTC, the PLL will converge in 15 minutes to 16 hours,
+- * respectively.
 + * SHIFT_PLL is used as a dampening factor to define how much we
 + * adjust the frequency correction for a given offset in PLL mode.
 + * It also used in dampening the offset correction, to define how
@@ -55,11 +61,7 @@
 + * adjustment code. A lower value makes it more flexible, reducing
 + * NTP convergence time. A higher value makes it stiffer, increasing
 + * convergence time, but making the clock more stable.
-  *
-- * MAXTC establishes the maximum time constant of the PLL. With the
-- * SHIFT_KG and SHIFT_KF values given and a time constant range from
-- * zero to MAXTC, the PLL will converge in 15 minutes to 16 hours,
-- * respectively.
++ *
 + * In David Mills' nanokenrel reference implmentation SHIFT_PLL is 4.
 + * However this seems to increase convergence time much too long.
 + *
@@ -86,10 +88,10 @@
  #define SHIFT_FLL	2	/* FLL frequency factor (shift) */
  #define MAXTC		10	/* maximum time constant (shift) */
  
-@@ -192,10 +212,10 @@ struct timex {
+@@ -83,10 +103,10 @@
  #define SHIFT_USEC 16		/* frequency offset scale (shift) */
- #define PPM_SCALE ((s64)NSEC_PER_USEC << (NTP_SCALE_SHIFT - SHIFT_USEC))
- #define PPM_SCALE_INV_SHIFT 19
+ #define PPM_SCALE (NSEC_PER_USEC << (NTP_SCALE_SHIFT - SHIFT_USEC))
+ #define PPM_SCALE_INV_SHIFT 20
 -#define PPM_SCALE_INV ((1ll << (PPM_SCALE_INV_SHIFT + NTP_SCALE_SHIFT)) / \
 +#define PPM_SCALE_INV ((1LL << (PPM_SCALE_INV_SHIFT + NTP_SCALE_SHIFT)) / \
  		       PPM_SCALE + 1)