diff options
author | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2005-04-27 13:18:22 +0000 |
---|---|---|
committer | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2005-04-27 13:18:22 +0000 |
commit | e65dc773b68687dfe71687364e2e666c7443fa8e (patch) | |
tree | 8a1d7bc771863a398cf0c0691a99ebc698119566 /sys/arch/i386 | |
parent | f83a4c1261ec9c1e7b03e571c7ac07562de3a77a (diff) |
add missing flags to /proc/cpuinfo and don't print invalid ones; deraadt@ ok
Diffstat (limited to 'sys/arch/i386')
-rw-r--r-- | sys/arch/i386/i386/procfs_machdep.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/i386/i386/procfs_machdep.c b/sys/arch/i386/i386/procfs_machdep.c index 4b3814d11ee..86b3142921d 100644 --- a/sys/arch/i386/i386/procfs_machdep.c +++ b/sys/arch/i386/i386/procfs_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: procfs_machdep.c,v 1.3 2005/04/21 00:31:23 deraadt Exp $ */ +/* $OpenBSD: procfs_machdep.c,v 1.4 2005/04/27 13:18:21 fgsch Exp $ */ /* $NetBSD: procfs_machdep.c,v 1.6 2001/02/21 21:39:59 jdolecek Exp $ */ /* @@ -54,9 +54,9 @@ extern int cpu_id, cpu_class; static const char * const i386_features[] = { "fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce", - "cx8", "apic", "10", "sep", "mtrr", "pge", "mca", "cmov", - "fgpat", "pse36", "psn", "19", "20", "21", "22", "mmx", - "fxsr", "xmm", "26", "27", "28", "29", "30", "31" + "cx8", "apic", NULL, "sep", "mtrr", "pge", "mca", "cmov", + "pat", "pse36", "pn", "clflush", NULL, "dts", "acpi", "mmx", + "fxsr", "sse", "sse2", "ss", "ht", "tm", "ia64", "pbe" }; @@ -75,7 +75,7 @@ procfs_getcpuinfstr(char *buf, int *len) p = featurebuf; left = sizeof featurebuf; for (i = 0; i < 32; i++) { - if (cpu_feature & (1 << i)) { + if ((cpu_feature & (1 << i)) && i386_features[i]) { l = snprintf(p, left, "%s ", i386_features[i]); if (l == -1) l = 0; |