diff options
| author | Gordon Willem Klok <gwk@cvs.openbsd.org> | 2006-07-10 19:45:23 +0000 |
|---|---|---|
| committer | Gordon Willem Klok <gwk@cvs.openbsd.org> | 2006-07-10 19:45:23 +0000 |
| commit | 5fb527538c76adcfce527fd8483bf774a06273bf (patch) | |
| tree | 7b42876544f395e19ed0e00eca7d20d1f6fb0aaa /sys/arch | |
| parent | 462ca7e24f372339ca3f4c47c4eb3ecc9709eb25 (diff) | |
The setperf mechanism cannot handle multiprocessor systems. Ensure that
p4tcc and speedstep are not initialized in multiprocessor kernels.
ok kettenis@
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/i386/i386/machdep.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index 6b8019c2b1e..48deede68f8 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.361 2006/06/17 17:23:39 dim Exp $ */ +/* $OpenBSD: machdep.c,v 1.362 2006/07/10 19:45:22 gwk Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -1461,6 +1461,7 @@ intel686_common_cpu_setup(struct cpu_info *ci) { #if !defined(SMALL_KERNEL) && defined(I686_CPU) +#if !defined(MULTIPROCESSOR) int family = (ci->ci_signature >> 8) & 15; int step = ci->ci_signature & 15; @@ -1473,7 +1474,7 @@ intel686_common_cpu_setup(struct cpu_info *ci) } else if ((cpu_feature & (CPUID_ACPI | CPUID_TM)) == (CPUID_ACPI | CPUID_TM)) p4tcc_init(family, step); - +#endif { extern void (*pagezero)(void *, size_t); extern void sse2_pagezero(void *, size_t); |