Merge branch 'hash' of git://ftp.sciencehorizons.net/linux

[linux-2.6-block.git] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index 96406e4db995529d41c1c6f0489813865a067ae3..d794384a0404d2e9b1d1e9c3f6a966ca877c647c 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -187,7 +187,11 @@ config HAVE_OPTPROBES
 config HAVE_KPROBES_ON_FTRACE
        bool
 
+config HAVE_NMI
+       bool
+
 config HAVE_NMI_WATCHDOG
+       depends on HAVE_NMI
        bool
 #
 # An arch should select this if it provides all these things:
@@ -517,6 +521,11 @@ config HAVE_ARCH_MMAP_RND_BITS
          - ARCH_MMAP_RND_BITS_MIN
          - ARCH_MMAP_RND_BITS_MAX
 
+config HAVE_EXIT_THREAD
+       bool
+       help
+         An architecture implements exit_thread.
+
 config ARCH_MMAP_RND_BITS_MIN
        int
 
@@ -646,4 +655,7 @@ config COMPAT_OLD_SIGACTION
 config ARCH_NO_COHERENT_DMA_MMAP
        bool
 
+config CPU_NO_EFFICIENT_FFS
+       def_bool n
+
 source "kernel/gcov/Kconfig"