From owner-svn-src-head@FreeBSD.ORG Thu Apr 18 07:09:28 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 28DDC3F1; Thu, 18 Apr 2013 07:09:28 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 1C081F33; Thu, 18 Apr 2013 07:09:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3I79RCQ044699; Thu, 18 Apr 2013 07:09:27 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3I79RiW044698; Thu, 18 Apr 2013 07:09:27 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <201304180709.r3I79RiW044698@svn.freebsd.org> From: Rui Paulo Date: Thu, 18 Apr 2013 07:09:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r249608 - head/sys/x86/include X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Apr 2013 07:09:28 -0000 Author: rpaulo Date: Thu Apr 18 07:09:27 2013 New Revision: 249608 URL: http://svnweb.freebsd.org/changeset/base/249608 Log: Move the previously added CPUID7 macros to CPUID_STDEXT. Modified: head/sys/x86/include/specialreg.h Modified: head/sys/x86/include/specialreg.h ============================================================================== --- head/sys/x86/include/specialreg.h Thu Apr 18 05:58:07 2013 (r249607) +++ head/sys/x86/include/specialreg.h Thu Apr 18 07:09:27 2013 (r249608) @@ -172,23 +172,6 @@ #define CPUTPM2_EFFREQ 0x00000001 /* - * Structured Extended Features - */ -#define CPUID7_GSFSBASE 0x00000001 -#define CPUID7_TSCADJ 0x00000002 -#define CPUID7_BMI1 0x00000008 -#define CPUID7_HLE 0x00000010 -#define CPUID7_AVX2 0x00000020 -#define CPUID7_SMEP 0x00000080 -#define CPUID7_BMI2 0x00000100 -#define CPUID7_ENHMOVSB 0x00000200 -#define CPUID7_INVPCID 0x00000400 -#define CPUID7_RTM 0x00000800 -#define CPUID7_RDSEED 0x00040000 -#define CPUID7_ADX 0x00080000 -#define CPUID7_SMAP 0x00100000 - -/* * Important bits in the AMD extended cpuid flags */ #define AMDID_SYSCALL 0x00000800 @@ -295,11 +278,22 @@ #define AMDID_COREID_SIZE 0x0000f000 #define AMDID_COREID_SIZE_SHIFT 12 +/* + * Structured Extended Features + */ #define CPUID_STDEXT_FSGSBASE 0x00000001 #define CPUID_STDEXT_TSC_ADJUST 0x00000002 +#define CPUID_STDEXT_BMI1 0x00000008 +#define CPUID_STDEXT_HLE 0x00000010 +#define CPUID_STDEXT_AVX2 0x00000020 #define CPUID_STDEXT_SMEP 0x00000080 +#define CPUID_STDEXT_BMI2 0x00000100 #define CPUID_STDEXT_ENH_MOVSB 0x00000200 +#define CPUID_STDEXT_RTM 0x00000800 #define CPUID_STDEXT_INVPCID 0x00000400 +#define CPUID_STDEXT_RDSEED 0x00040000 +#define CPUID_STDEXT_ADX 0x00080000 +#define CPUID_STDEXT_SMAP 0x00100000 /* * CPUID manufacturers identifiers