diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-08-31 19:47:03 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-08-31 19:47:03 +0200 |
| commit | 0050ae57cd02dbd4f171622d0269e2fb7029a23e (patch) | |
| tree | f2e98a37c20c3f8389e5cf3349d1d674e4197bfa /arch/x86 | |
| parent | a57e456a7b28431b55e407e5ab78ebd5b378d19e (diff) | |
| parent | 488ca7d72d974e3c00ae73ed9f947590680bdf00 (diff) | |
| download | blackbird-op-linux-0050ae57cd02dbd4f171622d0269e2fb7029a23e.tar.gz blackbird-op-linux-0050ae57cd02dbd4f171622d0269e2fb7029a23e.zip | |
Merge branch 'x86/cpufeature' into x86/urgent, because it's ready
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/include/asm/cpufeature.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h index 3d6606fb97d0..a94f83d4272a 100644 --- a/arch/x86/include/asm/cpufeature.h +++ b/arch/x86/include/asm/cpufeature.h @@ -239,6 +239,7 @@ #define X86_FEATURE_AVX512PF ( 9*32+26) /* AVX-512 Prefetch */ #define X86_FEATURE_AVX512ER ( 9*32+27) /* AVX-512 Exponential and Reciprocal */ #define X86_FEATURE_AVX512CD ( 9*32+28) /* AVX-512 Conflict Detection */ +#define X86_FEATURE_SHA_NI ( 9*32+29) /* SHA1/SHA256 Instruction Extensions */ /* Extended state features, CPUID level 0x0000000d:1 (eax), word 10 */ #define X86_FEATURE_XSAVEOPT (10*32+ 0) /* XSAVEOPT */ |
