Merge branch 'btrfs-3.0' into for-linus

[~andy/linux] / arch / x86 / Kconfig.cpu

diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
index 6a7cfdf8ff6915c291e14e2167b54e7469503a34..e3ca7e0d858c9203fe787244b6022193c7bc7769 100644 (file)
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
@@ -312,6 +312,9 @@ config X86_CMPXCHG
 config CMPXCHG_LOCAL
        def_bool X86_64 || (X86_32 && !M386)
 
+config CMPXCHG_DOUBLE
+       def_bool y
+
 config X86_L1_CACHE_SHIFT
        int
        default "7" if MPENTIUM4 || MPSC