diff options
| author | Pekka Enberg <penberg@kernel.org> | 2011-07-02 13:26:23 +0300 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2011-07-02 13:26:23 +0300 |
| commit | e4a46182e1bcc2ddacff5a35f6b52398b51f1b11 (patch) | |
| tree | 97298e13549de653041919efc5a8582ef30c6e75 /arch/x86/include/asm/cpufeature.h | |
| parent | b0af8dfdd67699e25083478c63eedef2e72ebd85 (diff) | |
| parent | 3824abd1279ef75f791c43a6b1e3162ae0692b42 (diff) | |
Merge remote branch 'tip/x86/atomic' into slub/lockless
Diffstat (limited to 'arch/x86/include/asm/cpufeature.h')
| -rw-r--r-- | arch/x86/include/asm/cpufeature.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h index 71cc3800712c..d1053cd6f896 100644 --- a/arch/x86/include/asm/cpufeature.h +++ b/arch/x86/include/asm/cpufeature.h @@ -288,6 +288,8 @@ extern const char * const x86_power_flags[32]; #define cpu_has_hypervisor boot_cpu_has(X86_FEATURE_HYPERVISOR) #define cpu_has_pclmulqdq boot_cpu_has(X86_FEATURE_PCLMULQDQ) #define cpu_has_perfctr_core boot_cpu_has(X86_FEATURE_PERFCTR_CORE) +#define cpu_has_cx8 boot_cpu_has(X86_FEATURE_CX8) +#define cpu_has_cx16 boot_cpu_has(X86_FEATURE_CX16) #if defined(CONFIG_X86_INVLPG) || defined(CONFIG_X86_64) # define cpu_has_invlpg 1 |