diff -purN -X /home/mbligh/.diff.exclude 600-kexec/include/asm-i386/lockmeter.h 630-lockmeter_notsc/include/asm-i386/lockmeter.h
--- 600-kexec/include/asm-i386/lockmeter.h	2004-02-18 15:44:39.000000000 -0800
+++ 630-lockmeter_notsc/include/asm-i386/lockmeter.h	2004-02-20 15:56:21.000000000 -0800
@@ -108,9 +108,6 @@ extern inline int rwlock_readers(rwlock_
 /* this is a lot of typing just to get gcc to emit "rdtsc" */
 static inline long long get_cycles64 (void)
 {
-#ifndef CONFIG_X86_TSC
-	#error this code requires CONFIG_X86_TSC
-#else
 	union longlong_u {
 		long long intlong;
 		struct intint_s {
@@ -121,7 +118,6 @@ static inline long long get_cycles64 (vo
 
 	rdtsc(longlong.intint.eax,longlong.intint.edx);
 	return longlong.intlong;
-#endif
 }
 
 #endif /* _I386_LOCKMETER_H */