Date: Sat, 19 Dec 2009 05:50:12 -0800 From: David Wolfskill <david@catwhisker.org> To: stable@freebsd.org Subject: Re: Failure during GENERIC (i386) kernel build at r200721 Message-ID: <20091219135012.GJ470@bunrab.catwhisker.org> In-Reply-To: <20091219133511.GI470@bunrab.catwhisker.org> References: <20091219133511.GI470@bunrab.catwhisker.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--vs0rQTeTompTJjtd
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
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 -0=
800
+++ 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:2=
9:12Z avg $
+ * $FreeBSD: stable/8/sys/i386/include/specialreg.h 200262 2009-12-08 15:2=
7:06Z avg $
*/
=20
#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) >=3D 0x600) ? \
(((id) & CPUID_EXT_MODEL) >> 12) : 0))
-#define I386_CPU_FAMILY(id) \
+#define CPUID_TO_FAMILY(id) \
((((id) & CPUID_FAMILY) >> 8) + \
((((id) & CPUID_FAMILY) =3D=3D 0xf00) ? \
(((id) & CPUID_EXT_FAMILY) >> 20) : 0))
@@ -183,6 +183,13 @@
#define CPUID_HTT_CORES 0x00ff0000
#define CPUID_LOCAL_APIC_ID 0xff000000
=20
+/*=20
+ * 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
--=20
David H. Wolfskill david@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.
--vs0rQTeTompTJjtd
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (FreeBSD)
iEYEARECAAYFAkss2hMACgkQmprOCmdXAD3S+QCcD7abM2rJWSKnCUYfNrawjh/M
cNsAn0nl/U0lPOnBxBCDzVO6xpKztKpH
=ge/w
-----END PGP SIGNATURE-----
--vs0rQTeTompTJjtd--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20091219135012.GJ470>