summaryrefslogtreecommitdiff
path: root/sys/arch/i386
diff options
context:
space:
mode:
authorJason Downs <downsj@cvs.openbsd.org>1999-09-30 04:00:43 +0000
committerJason Downs <downsj@cvs.openbsd.org>1999-09-30 04:00:43 +0000
commit3472125cd9054dc46444acd616e38e372d0e3a8c (patch)
tree7d8553a7fd715f2a3c9cec033739186c10452192 /sys/arch/i386
parent176c6cb25270afe0327e0f406bd129181e666029 (diff)
Make sure 'model' and 'step' are initialized, even for non-cpuid chips.
Fix Cyrix setup to do it's thing for non-cpuid M1 processors.
Diffstat (limited to 'sys/arch/i386')
-rw-r--r--sys/arch/i386/i386/machdep.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index d77c4a24295..343dfae1ce3 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.113 1999/09/03 18:00:50 art Exp $ */
+/* $OpenBSD: machdep.c,v 1.114 1999/09/30 04:00:42 downsj Exp $ */
/* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */
/*-
@@ -884,6 +884,7 @@ cyrix6x86_cpu_setup(cpu_device, model, step)
extern int cpu_feature;
switch (model) {
+ case -1: /* M1 w/o cpuid */
case 2: /* M1 */
/* set up various cyrix registers */
/* Enable suspend on halt */
@@ -1026,6 +1027,8 @@ identifycpu()
name = i386_nocpuid_cpus[cpu].cpu_name;
vendor = i386_nocpuid_cpus[cpu].cpu_vendor;
vendorname = i386_nocpuid_cpus[cpu].cpu_vendorname;
+ model = -1;
+ step = -1;
class = i386_nocpuid_cpus[cpu].cpu_class;
cpu_setup = i386_nocpuid_cpus[cpu].cpu_setup;
modifier = "";