Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

[net-next-2.6.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 36890f0c8456db1eb212abc46a876e145fa8e0ca..be85a0ab1b822176b4c715266adfea779035af70 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -71,7 +71,7 @@ config BROKEN_ON_SMP
 
 config LOCK_KERNEL
        bool
-       depends on SMP || PREEMPT
+       depends on (SMP || PREEMPT) && BKL
        default y
 
 config INIT_ENV_ARG_LIMIT