summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2004-06-09 16:01:49 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2004-06-09 16:01:49 +0000
commite04517cc35363d9b03a6624d0252e326c11b9bf6 (patch)
tree8ebc7e46cb2f95e964321ba7dae3b2255f82365a
parent75d5b12051c9a937f5984c118579bda6942a494b (diff)
we trust the calibrated pentium_mhz more, so don't overwrite it unless
we know the cpu speed has changed. fixes pr3814 from mark pecaut.
-rw-r--r--sys/arch/i386/i386/machdep.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index e1e30a21df0..07ac282f32d 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.295 2004/06/06 17:34:37 grange Exp $ */
+/* $OpenBSD: machdep.c,v 1.296 2004/06/09 16:01:48 tedu Exp $ */
/* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */
/*-
@@ -1392,7 +1392,6 @@ intel686_cpu_setup(const char *cpu_device, int model, int step)
#if !defined(SMALL_KERNEL) && defined(I686_CPU)
p3_step = step;
update_cpuspeed = p3_update_cpuspeed;
- update_cpuspeed();
#endif
}
@@ -1404,7 +1403,6 @@ intel686_p4_cpu_setup(const char *cpu_device, int model, int step)
#if !defined(SMALL_KERNEL) && defined(I686_CPU)
p4_model = model;
update_cpuspeed = p4_update_cpuspeed;
- update_cpuspeed();
#endif
}