diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-23 19:35:43 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-23 19:35:43 +0200 |
| commit | 148a7b1725b3ca89ee13e410eec10ce2c2094d9b (patch) | |
| tree | cdddea55ba65c1c090d13b91e1b9965b5d30419b /arch/x86/include/asm/cpufeature.h | |
| parent | Merge branch 'timers-clocksource-for-linus' of git://git.kernel.org/pub/scm/l... (diff) | |
| parent | x86: Add support for cmpxchg_double (diff) | |
| download | linux-148a7b1725b3ca89ee13e410eec10ce2c2094d9b.tar.xz linux-148a7b1725b3ca89ee13e410eec10ce2c2094d9b.zip | |
Merge branch 'x86-atomic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-atomic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Add support for cmpxchg_double
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 9929b35929ff..4258aac99a6e 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 |