diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-01-12 11:08:13 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-01-12 11:08:13 +0100 |
| commit | c0c57019a65341f08858541d2740b74dee821cf1 (patch) | |
| tree | 584ac03f7dfa26c9c45c3d66ad306222e893fa33 /arch/x86/include/asm/cmpxchg_64.h | |
| parent | x86/boot: Double BOOT_HEAP_SIZE to 64KB (diff) | |
| parent | Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| download | linux-c0c57019a65341f08858541d2740b74dee821cf1.tar.xz linux-c0c57019a65341f08858541d2740b74dee821cf1.zip | |
Merge commit 'linus' into x86/urgent, to pick up recent x86 changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/cmpxchg_64.h')
| -rw-r--r-- | arch/x86/include/asm/cmpxchg_64.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/cmpxchg_64.h b/arch/x86/include/asm/cmpxchg_64.h index 1af94697aae5..caa23a34c963 100644 --- a/arch/x86/include/asm/cmpxchg_64.h +++ b/arch/x86/include/asm/cmpxchg_64.h @@ -18,6 +18,6 @@ static inline void set_64bit(volatile u64 *ptr, u64 val) cmpxchg_local((ptr), (o), (n)); \ }) -#define system_has_cmpxchg_double() cpu_has_cx16 +#define system_has_cmpxchg_double() boot_cpu_has(X86_FEATURE_CX16) #endif /* _ASM_X86_CMPXCHG_64_H */ |