Merge branch 'core/urgent' into core/locking

[~andy/linux] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index b3c8be0da17f8472429ad79787c76d42fa62eb02..3f7fb4de6ee7dd2b15f8de02f2e96a0e02f49728 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -51,13 +51,6 @@ config PERCPU_RWSEM
 config ARCH_USE_CMPXCHG_LOCKREF
        bool
 
-config CMPXCHG_LOCKREF
-       def_bool y if ARCH_USE_CMPXCHG_LOCKREF
-       depends on SMP
-       depends on !GENERIC_LOCKBREAK
-       depends on !DEBUG_SPINLOCK
-       depends on !DEBUG_LOCK_ALLOC
-
 config CRC_CCITT
        tristate "CRC-CCITT functions"
        help
@@ -189,6 +182,13 @@ config AUDIT_GENERIC
        depends on AUDIT && !AUDIT_ARCH
        default y
 
+config RANDOM32_SELFTEST
+       bool "PRNG perform self test on init"
+       default n
+       help
+         This option enables the 32 bit PRNG library functions to perform a
+         self test on initialization.
+
 #
 # compression support is select'ed if needed
 #
@@ -342,7 +342,8 @@ config CHECK_SIGNATURE
        bool
 
 config CPUMASK_OFFSTACK
-       bool "Force CPU masks off stack" if DEBUG_PER_CPU_MAPS
+       bool "Force CPU masks off stack"
+       depends on SMP
        help
          Use dynamic allocation for cpumask_var_t, instead of putting
          them on the stack.  This is a bit more expensive, but avoids