summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/i386/i386/machdep.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index e495c3da0d6..c33c08137ec 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.281 2004/02/19 23:10:42 deraadt Exp $ */
+/* $OpenBSD: machdep.c,v 1.282 2004/02/19 23:31:58 deraadt Exp $ */
/* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */
/*-
@@ -2037,12 +2037,10 @@ identifycpu()
if (cpu_setup != NULL)
cpu_setup(cpu_device, model, step);
-#if 0
#ifndef SMALL_KERNEL
if (cpu_cpuspeed == NULL && pentium_mhz != 0)
cpu_cpuspeed = pentium_cpuspeed;
#endif
-#endif
cpu_class = class;
@@ -2179,11 +2177,7 @@ p4_cpuspeed(int *freq)
int
pentium_cpuspeed(int *freq)
{
- /* XXX: what about CPU without TSC? */
- if (cpu_feature & CPUID_TSC)
- calibrate_cyclecounter();
*freq = pentium_mhz;
-
return (0);
}
#endif