patch-2.2.0-pre2 linux/include/asm-i386/timex.h

Next file: linux/include/asm-i386/uaccess.h
Previous file: linux/include/asm-i386/string.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.2.0-pre1/linux/include/asm-i386/timex.h linux/include/asm-i386/timex.h
@@ -6,6 +6,8 @@
 #ifndef _ASMi386_TIMEX_H
 #define _ASMi386_TIMEX_H
 
+#include <linux/config.h>
+
 #define CLOCK_TICK_RATE	1193180 /* Underlying HZ */
 #define CLOCK_TICK_FACTOR	20	/* Factor of both 1000000 and CLOCK_TICK_RATE */
 #define FINETUNE ((((((long)LATCH * HZ - CLOCK_TICK_RATE) << SHIFT_HZ) * \
@@ -32,7 +34,7 @@
 
 static inline cycles_t get_cycles (void)
 {
-#if CPU < 586
+#ifndef CONFIG_TSC
 	return 0;
 #else
 	unsigned long eax, edx;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov