patch-2.1.101 linux/include/linux/timex.h

• Lines: 37
• Date: Thu May 7 23:53:35 1998
• Orig file: v2.1.100/linux/include/linux/timex.h
• Orig date: Wed Apr 16 14:15:00 1997

diff -u --recursive --new-file v2.1.100/linux/include/linux/timex.h linux/include/linux/timex.h
@@ -17,6 +17,10 @@
 /*
  * Modification history timex.h
  *
+ * 29 Dec 97	Russell King
+ *	Moved CLOCK_TICK_RATE, CLOCK_TICK_FACTOR and FINETUNE to asm/timex.h
+ *	for ARM machines
+ *
  *  9 Jan 97    Adrian Sun
  *      Shifted LATCH define to allow access to alpha machines.
  *
@@ -125,20 +129,13 @@
 #define PPS_VALID 120		/* pps signal watchdog max (s) */
 #define MAXGLITCH 30		/* pps signal glitch max (s) */
 
-/* LATCH is used in the interval timer and ftape setup. */
-#define CLOCK_TICK_RATE	1193180 /* Underlying HZ */
-#define LATCH  ((CLOCK_TICK_RATE + HZ/2) / HZ)	/* For divider */
-
-#ifndef __alpha__
 /*
- * This definitively is wrong for the Alpha and none of the
- * kernel code seems to reference this anymore.
+ * Pick up the architecture specific timex specifications
  */
-#define CLOCK_TICK_FACTOR	20	/* Factor of both 1000000 and CLOCK_TICK_RATE */
-#define FINETUNE ((((((long)LATCH * HZ - CLOCK_TICK_RATE) << SHIFT_HZ) * \
-	(1000000/CLOCK_TICK_FACTOR) / (CLOCK_TICK_RATE/CLOCK_TICK_FACTOR)) \
-		<< (SHIFT_SCALE-SHIFT_HZ)) / HZ)
-#endif /* !__alpha__ */
+#include <asm/timex.h>
+
+/* LATCH is used in the interval timer and ftape setup. */
+#define LATCH  ((CLOCK_TICK_RATE + HZ/2) / HZ)	/* For divider */
 
 /*
  * syscall interface - used (mainly by NTP daemon)