Messages in this thread Patch in this message | | | Subject | [PATCH][TRIVIAL] linux-2.5.57_x86-tsc-cleanup_A0 | From | john stultz <> | Date | 13 Jan 2003 19:26:42 -0800 |
| |
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;
- 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/
| |