Merge branch 'pci_id_updates' of git://git.kernel.org/pub/scm/linux/kernel/git/mcheha...

[sfrench/cifs-2.6.git] / arch / x86 / kernel / cpu / bugs.c

diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index 027e5c003b167df8ed361e8e33c0a6af698f8344..170d2f5523b2c6e04f4c28aa423077388bb3abce 100644 (file)
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -142,14 +142,6 @@ static void __init check_config(void)
                panic("Kernel requires i486+ for 'invlpg' and other features");
 #endif
 
-/*
- * If we configured ourselves for a TSC, we'd better have one!
- */
-#ifdef CONFIG_X86_TSC
-       if (!cpu_has_tsc)
-               panic("Kernel compiled for Pentium+, requires TSC feature!");
-#endif
-
 /*
  * If we were told we had a good local APIC, check for buggy Pentia,
  * i.e. all B steppings and the C2 stepping of P54C when using their