summaryrefslogtreecommitdiff
path: root/sys/arch/i386/include
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2009-02-16 15:44:26 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2009-02-16 15:44:26 +0000
commit12b0ca277e8cf3655bddd75b694086d6a8159dc2 (patch)
tree4772cfc4c7f1d2b576c7f30ba2cf48ad4ccdd32e /sys/arch/i386/include
parent7b6b94111a9292f433eef65e1ea39265309976a8 (diff)
Store conditionally extended cpuid family/model values
in seperate variables in struct cpu_info instead of duplicating the process of extracting it from the signature. Use this value when determining the bus clock on P6/family 0x6 chips, which fixes speedstep on bernd@'s ThinkPad x200s. Discussed with several, 'just do it' weingart@, ok mikeb@
Diffstat (limited to 'sys/arch/i386/include')
-rw-r--r--sys/arch/i386/include/cpu.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/arch/i386/include/cpu.h b/sys/arch/i386/include/cpu.h
index 56e1263eb20..c9115640e46 100644
--- a/sys/arch/i386/include/cpu.h
+++ b/sys/arch/i386/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.106 2008/11/22 18:12:32 art Exp $ */
+/* $OpenBSD: cpu.h,v 1.107 2009/02/16 15:44:25 jsg Exp $ */
/* $NetBSD: cpu.h,v 1.35 1996/05/05 19:29:26 christos Exp $ */
/*-
@@ -115,6 +115,8 @@ struct cpu_info {
u_int32_t ci_level;
u_int32_t ci_vendor[4];
u_int32_t ci_signature; /* X86 cpuid type */
+ u_int32_t ci_family; /* extended cpuid family */
+ u_int32_t ci_model; /* extended cpuid model */
u_int32_t ci_feature_flags; /* X86 CPUID feature bits */
u_int32_t cpu_class; /* CPU class */