diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2004-02-19 23:31:59 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2004-02-19 23:31:59 +0000 |
| commit | 8a0da5685222a65405d4fbf21f35c6836ccc1201 (patch) | |
| tree | 6554448b9462ba850836d8feae2c45527eee8f13 /sys | |
| parent | 8e63928138ef00e1163db312474fbf69adfbf283 (diff) | |
better fix to avoid 1 second machine pauses; from grange
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/i386/i386/machdep.c | 8 |
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 |