From: Ingo Molnar <mingo@elte.hu>



Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 include/asm-i386/bugs.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN include/asm-i386/bugs.h~sched-improve-sched_clock-on-i686-fix include/asm-i386/bugs.h
--- a/include/asm-i386/bugs.h~sched-improve-sched_clock-on-i686-fix
+++ a/include/asm-i386/bugs.h
@@ -160,7 +160,7 @@ static void __init check_config(void)
  * If we configured ourselves for a TSC, we'd better have one!
  */
 #ifdef CONFIG_X86_TSC
-	if (!cpu_has_tsc)
+	if (!cpu_has_tsc && !tsc_disable)
 		panic("Kernel compiled for Pentium+, requires TSC feature!");
 #endif
 
_