Index: kernel/time.c
===================================================================
RCS file: /root/21REP/linux21/kernel/time.c,v
retrieving revision 1.1.1.4.12.3
diff -u -r1.1.1.4.12.3 time.c
--- kernel/time.c	2001/02/26 20:36:42	1.1.1.4.12.3
+++ kernel/time.c	2001/03/06 19:42:58
@@ -130,8 +130,10 @@
  * 2001-02-26	Ulrich Windl
  *	Added spinlock for hardpps(). Fixed logic to detect negative time
  *	warps. Updated clock model according to	``nanokernel-20001025'':
- *	``PPS_FAVGDEF'' changed form 7 to 8. Clearing `STA_PLL'' will reset
+ *	``PPS_FAVGDEF'' changed form 7 to 8. Clearing ``STA_PLL'' will reset
  *	``time_status''.
+ * 2001-03-06	Ulrich Windl
+ *	Fixed stupid and fatal bug when ``STA_PLL'' is cleared.
  */
 #include <linux/config.h>
 #define	NTP_NANO	/* we want to see nanoseconds in <linux/timex.h> */
@@ -1433,7 +1435,7 @@
 #ifdef CONFIG_NTP_PPS
 				/* the PPS calibration interval may end
 				   surprisingly early */
-				pps.shift = time_freq;
+				pps.shift = PPS_FAVG;
 				pps.intcnt = 0;
 #endif
 			}