Commit-ID: 74beb09a80ca248ba9d54dede80aebc2557ccb30
Gitweb: http://git.kernel.org/tip/74beb09a80ca248ba9d54dede80aebc2557ccb30
Author: Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Wed, 15 Mar 2017 17:40:19 -0300
Committer: Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Thu, 16 Mar 2017 09:23:22 -0300
tools headers: Sync {tools/,}arch/x86/include/asm/cpufeatures.h
We use those in tools/arch/x86/lib/mem{cpy,set}_64.S, in turn used
in the 'perf bench mem' benchmarks.
The changes in the following csets are not relevant for this usecase,
but lets sync it to silence the diff detector in the tools build system:
78d1b296843a ("x86/cpu: Add X86_FEATURE_CPUID")
3bba73b1b7a8 ("x86/cpufeature: Move RING3MWAIT feature to avoid conflicts")
Cc: Borislav Petkov <[email protected]>
Cc: Jiri Olsa <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Link: http://lkml.kernel.org/n/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
tools/arch/x86/include/asm/cpufeatures.h | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/tools/arch/x86/include/asm/cpufeatures.h
b/tools/arch/x86/include/asm/cpufeatures.h
index 293149a..4e77723 100644
--- a/tools/arch/x86/include/asm/cpufeatures.h
+++ b/tools/arch/x86/include/asm/cpufeatures.h
@@ -100,7 +100,7 @@
#define X86_FEATURE_XTOPOLOGY ( 3*32+22) /* cpu topology enum extensions */
#define X86_FEATURE_TSC_RELIABLE ( 3*32+23) /* TSC is known to be reliable */
#define X86_FEATURE_NONSTOP_TSC ( 3*32+24) /* TSC does not stop in C
states */
-/* free, was #define X86_FEATURE_CLFLUSH_MONITOR ( 3*32+25) * "" clflush reqd
with monitor */
+#define X86_FEATURE_CPUID ( 3*32+25) /* CPU has CPUID instruction itself
*/
#define X86_FEATURE_EXTD_APICID ( 3*32+26) /* has extended APICID (8
bits) */
#define X86_FEATURE_AMD_DCM ( 3*32+27) /* multi-node processor */
#define X86_FEATURE_APERFMPERF ( 3*32+28) /* APERFMPERF */
@@ -186,7 +186,7 @@
*
* Reuse free bits when adding new feature flags!
*/
-
+#define X86_FEATURE_RING3MWAIT ( 7*32+ 0) /* Ring 3 MONITOR/MWAIT */
#define X86_FEATURE_CPB ( 7*32+ 2) /* AMD Core Performance
Boost */
#define X86_FEATURE_EPB ( 7*32+ 3) /* IA32_ENERGY_PERF_BIAS
support */
#define X86_FEATURE_CAT_L3 ( 7*32+ 4) /* Cache Allocation Technology L3 */
@@ -321,5 +321,4 @@
#define X86_BUG_SWAPGS_FENCE X86_BUG(11) /* SWAPGS without input dep on GS */
#define X86_BUG_MONITOR X86_BUG(12) /* IPI required to wake up
remote CPU */
#define X86_BUG_AMD_E400 X86_BUG(13) /* CPU is among the affected by
Erratum 400 */
-
#endif /* _ASM_X86_CPUFEATURES_H */
