Messages in this thread Patch in this message | | | Date | Sat, 27 Dec 2003 17:27:39 -0800 | From | "Martin J. Bligh" <> | Subject | [PATCH] lockmeter does not require CONFIG_X86_TSC |
| |
Due to the extreme twistedness of the world, CONFIG_X86_TSC doesn't mean "I have a TSC", it means "I compiled out PIT support completely". Don't ask me why.
However, this means that the check for it in the lockmeter code is invalid - it's perfectly valid to use a i386 compiled kernel on a 686, where CONFIG_X86_TSC is off, but we have both TSC and PIT support.
Patch simply removes the #error check.
M.
diff -urpN -X /home/fletch/.diff.exclude 620-force_wholefrag/include/asm-i386/lockmeter.h 630-lockmeter_notsc/include/asm-i386/lockmeter.h --- 620-force_wholefrag/include/asm-i386/lockmeter.h Sat Dec 27 14:43:41 2003 +++ 630-lockmeter_notsc/include/asm-i386/lockmeter.h Sat Dec 27 17:16:58 2003 @@ -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 */ - 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/
| |