Merge tag 'v3.6-rc5' into for-linus

[~andy/linux] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index bfdbb1ff0aa39db058be3933b725d0737cd1f7b6..bb94c1ba616a4213bc11521adef4310387032353 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -340,6 +340,9 @@ config NLATTR
 config GENERIC_ATOMIC64
        bool
 
+config ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
+       def_bool y if GENERIC_ATOMIC64
+
 config LRU_CACHE
        tristate