Failure during GENERIC (i386) kernel build at r200721

[David Wolfskill]

I looked in my stbale/8 sources for comparison and found the definition
of CPUID_TO_FAMILY in sys/i386/include/specialreg.h.

Here's a diff comparing the stable/7 vs. the stable/8 versions of that
file:

--- /usr/src/sys/i386/include/specialreg.h	2009-12-09 04:36:55.000000000 -0800
+++ sys/i386/include/specialreg.h	2009-12-09 05:39:17.000000000 -0800
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)specialreg.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD: stable/7/sys/i386/include/specialreg.h 200263 2009-12-08 15:29:12Z avg $
+ * $FreeBSD: stable/8/sys/i386/include/specialreg.h 200262 2009-12-08 15:27:06Z avg $
  */
 
 #ifndef _MACHINE_SPECIALREG_H_
@@ -166,11 +166,11 @@
 #define	CPUID_FAMILY		0x00000f00
 #define	CPUID_EXT_MODEL		0x000f0000
 #define	CPUID_EXT_FAMILY	0x0ff00000
-#define	I386_CPU_MODEL(id) \
+#define	CPUID_TO_MODEL(id) \
     ((((id) & CPUID_MODEL) >> 4) | \
     ((((id) & CPUID_FAMILY) >= 0x600) ? \
     (((id) & CPUID_EXT_MODEL) >> 12) : 0))
-#define	I386_CPU_FAMILY(id) \
+#define	CPUID_TO_FAMILY(id) \
     ((((id) & CPUID_FAMILY) >> 8) + \
     ((((id) & CPUID_FAMILY) == 0xf00) ? \
     (((id) & CPUID_EXT_FAMILY) >> 20) : 0))
@@ -183,6 +183,13 @@
 #define	CPUID_HTT_CORES		0x00ff0000
 #define	CPUID_LOCAL_APIC_ID	0xff000000
 
+/* 
+ * CPUID instruction 0xb ebx info.
+ */
+#define	CPUID_TYPE_INVAL	0
+#define	CPUID_TYPE_SMT		1
+#define	CPUID_TYPE_CORE		2
+
 /*
  * AMD extended function 8000_0007h edx info
  */

Peace,
david
-- 
David H. Wolfskill				david at catwhisker.org
Depriving a girl or boy of an opportunity for education is evil.

See http://www.catwhisker.org/~david/publickey.gpg for my public key.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-stable/attachments/20091219/2b3a2acc/attachment.pgp