Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

[~andy/linux] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index 26b0e2397a5724140bc8683fedd6bbae67706fe5..4b0669cbb3b01d4c0eb66f364859cb6f65654693 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -178,4 +178,7 @@ config HAVE_ARCH_MUTEX_CPU_RELAX
 config HAVE_RCU_TABLE_FREE
        bool
 
+config ARCH_HAVE_NMI_SAFE_CMPXCHG
+       bool
+
 source "kernel/gcov/Kconfig"