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 8d24bacaa61ea5746e326133d32f019f9511b602..4b0669cbb3b01d4c0eb66f364859cb6f65654693 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -175,4 +175,10 @@ config HAVE_ARCH_JUMP_LABEL
 config HAVE_ARCH_MUTEX_CPU_RELAX
        bool
 
+config HAVE_RCU_TABLE_FREE
+       bool
+
+config ARCH_HAVE_NMI_SAFE_CMPXCHG
+       bool
+
 source "kernel/gcov/Kconfig"