summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorgrange <grange@openbsd.org>2003-12-29 08:14:18 +0000
committergrange <grange@openbsd.org>2003-12-29 08:14:18 +0000
commit691cbf3f980d241aab3540177069976a2be478ed (patch)
tree7630e092c1802a7de0c785906cb69d67c355c21b /sys
parenttypo from form@ (evil qwerty) (diff)
downloadwireguard-openbsd-691cbf3f980d241aab3540177069976a2be478ed.tar.xz
wireguard-openbsd-691cbf3f980d241aab3540177069976a2be478ed.zip
Properly recognize SiS CPU family;
tested by Ian Zagorskih <ianzag@megasignal.com>. ok mickey@
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/i386/i386/machdep.c27
-rw-r--r--sys/arch/i386/include/cputypes.h3
2 files changed, 28 insertions, 2 deletions
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index 20c64b4dd6b..76ace682b64 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.257 2003/12/20 18:23:18 tedu Exp $ */
+/* $OpenBSD: machdep.c,v 1.258 2003/12/29 08:14:18 grange Exp $ */
/* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */
/*-
@@ -1018,6 +1018,31 @@ const struct cpu_cpuid_nameclass i386_cpuid_cpus[] = {
},
natsem6x86_cpu_setup
} }
+ },
+ {
+ "SiS SiS SiS ",
+ CPUVENDOR_SIS,
+ "SiS",
+ /* Family 4, not available from SiS */
+ { {
+ CPUCLASS_486,
+ {
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ "486 class" /* Default */
+ },
+ NULL
+ },
+ /* Family 5 */
+ {
+ CPUCLASS_586,
+ {
+ "SiS55x", 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0,
+ "586 class" /* Default */
+ },
+ NULL
+ } }
}
};
diff --git a/sys/arch/i386/include/cputypes.h b/sys/arch/i386/include/cputypes.h
index 19f79498070..d16e0be3b07 100644
--- a/sys/arch/i386/include/cputypes.h
+++ b/sys/arch/i386/include/cputypes.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cputypes.h,v 1.9 2002/03/30 09:42:28 mickey Exp $ */
+/* $OpenBSD: cputypes.h,v 1.10 2003/12/29 08:14:18 grange Exp $ */
/* $NetBSD: cputypes.h,v 1.10 1997/10/18 04:51:03 mikel Exp $ */
/*
@@ -69,6 +69,7 @@
#define CPUVENDOR_TRANSMETA 6
#define CPUVENDOR_NS 7
#define CPUVENDOR_VIA 8
+#define CPUVENDOR_SIS 9
/*
* Some other defines, dealing with values returned by cpuid.