[TRIVIAL] linux-2.5.57_x86-tsc-cleanup_A0

From: Rusty Trivial Russell (rusty@rustcorp.com.au)
Date: Thu Feb 06 2003 - 00:56:51 EST

From: john stultz <johnstul@us.ibm.com>

  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
  
  

--- trivial-2.5-bk/include/asm-i386/timex.h.orig 2003-02-06 16:30:27.000000000 +1100
+++ trivial-2.5-bk/include/asm-i386/timex.h 2003-02-06 16:30:27.000000000 +1100
@@ -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; 

-- 
  Don't blame me: the Monkey is driving
  File: john stultz <johnstul@us.ibm.com>: [PATCH][TRIVIAL] linux-2.5.57_x86-tsc-cleanup_A0
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

This archive was generated by hypermail 2b29 : Fri Feb 07 2003 - 22:00:19 EST