[PATCH][TRIVIAL] linux-2.5.57_x86-tsc-cleanup_A0

[john stultz]

Linus, All,
	Since no one complained about this over the weekend, here it is. This
patch simply removes one more of the remaining CONFIG_X86_TSC #ifdefs
(this one from get_cycles()). Instead of a compile time switch, it
switches on cpu_has_tsc. 

Please apply.

thanks
-john

diff -Nru a/include/asm-i386/timex.h b/include/asm-i386/timex.h
--- a/include/asm-i386/timex.h	Mon Jan 13 17:29:06 2003
+++ b/include/asm-i386/timex.h	Mon Jan 13 17:29:06 2003
@@ -40,14 +40,10 @@
 
 static inline cycles_t get_cycles (void)
 {
-#ifndef CONFIG_X86_TSC
-	return 0;
-#else
-	unsigned long long ret;
-
-	rdtscll(ret);
+	unsigned long long ret = 0;
+	if(cpu_has_tsc)
+		rdtscll(ret);
 	return ret;
-#endif
 }
 
 extern unsigned long cpu_khz;