svn commit: r290733 - in stable/9/sys/i386: i386 include

[John Baldwin]

Author: jhb
Date: Fri Nov 13 00:47:44 2015
New Revision: 290733
URL: https://svnweb.freebsd.org/changeset/base/290733

Log:
  Fix i386 build.  stable/9 does not have XSAVE support.
  
  Pointy hat to:	jhb

Modified:
  stable/9/sys/i386/i386/machdep.c
  stable/9/sys/i386/include/specialreg.h

Modified: stable/9/sys/i386/i386/machdep.c
==============================================================================
--- stable/9/sys/i386/i386/machdep.c	Fri Nov 13 00:34:57 2015	(r290732)
+++ stable/9/sys/i386/i386/machdep.c	Fri Nov 13 00:47:44 2015	(r290733)
@@ -1962,8 +1962,6 @@ DB_SHOW_COMMAND(sysregs, db_show_sysregs
 	db_printf("cr2\t0x%08x\n", rcr2());
 	db_printf("cr3\t0x%08x\n", rcr3());
 	db_printf("cr4\t0x%08x\n", rcr4());
-	if (rcr4() & CR4_XSAVE)
-		db_printf("xcr0\t0x%016llx\n", rxcr(0));
 	if (amd_feature & (AMDID_NX | AMDID_LM))
 		db_printf("EFER\t0x%016llx\n", rdmsr(MSR_EFER));
 	if (cpu_feature2 & (CPUID2_VMX | CPUID2_SMX))

Modified: stable/9/sys/i386/include/specialreg.h
==============================================================================
--- stable/9/sys/i386/include/specialreg.h	Fri Nov 13 00:34:57 2015	(r290732)
+++ stable/9/sys/i386/include/specialreg.h	Fri Nov 13 00:47:44 2015	(r290733)
@@ -281,6 +281,7 @@
 #define	MSR_APICBASE		0x01b
 #define	MSR_EBL_CR_POWERON	0x02a
 #define	MSR_TEST_CTL		0x033
+#define	MSR_IA32_FEATURE_CONTROL 0x03a
 #define	MSR_BIOS_UPDT_TRIG	0x079
 #define	MSR_BBL_CR_D0		0x088
 #define	MSR_BBL_CR_D1		0x089