diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-11-01 07:47:40 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-11-01 07:47:40 +0100 |
commit | c29c716662d0cefc0cda4903aea5ed6794174679 (patch) | |
tree | 01d4dc47933e1bcbeca8d53b0cf5c1f70da04535 /tools/arch | |
parent | e63650840e8b053aa09ad934877e87e9941ed135 (diff) | |
parent | 405c0759712f57b680f66aee9c55cd06ad1cbdef (diff) | |
download | linux-c29c716662d0cefc0cda4903aea5ed6794174679.tar.gz linux-c29c716662d0cefc0cda4903aea5ed6794174679.tar.bz2 linux-c29c716662d0cefc0cda4903aea5ed6794174679.zip |
Merge branch 'core/urgent' into x86/fpu, to merge fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/arch')
-rw-r--r-- | tools/arch/x86/include/asm/cpufeatures.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/arch/x86/include/asm/cpufeatures.h b/tools/arch/x86/include/asm/cpufeatures.h index 2599222215c9..cddd5d06e1cb 100644 --- a/tools/arch/x86/include/asm/cpufeatures.h +++ b/tools/arch/x86/include/asm/cpufeatures.h @@ -193,6 +193,8 @@ #define X86_FEATURE_PROC_FEEDBACK ( 7*32+ 9) /* AMD ProcFeedbackInterface */ #define X86_FEATURE_INTEL_PT ( 7*32+15) /* Intel Processor Trace */ +#define X86_FEATURE_AVX512_4VNNIW (7*32+16) /* AVX-512 Neural Network Instructions */ +#define X86_FEATURE_AVX512_4FMAPS (7*32+17) /* AVX-512 Multiply Accumulation Single precision */ /* Virtualization flags: Linux defined, word 8 */ #define X86_FEATURE_TPR_SHADOW ( 8*32+ 0) /* Intel TPR Shadow */ |