Merge remote branch 'linus/master'

[powerpc.git] / kernel / Kconfig.preempt

diff --git a/kernel/Kconfig.preempt b/kernel/Kconfig.preempt
index 61fa116..0669b70 100644 (file)
--- a/kernel/Kconfig.preempt
+++ b/kernel/Kconfig.preempt
@@ -52,17 +52,6 @@ config PREEMPT
 
 endchoice
 
-config PREEMPT_BKL
-       bool "Preempt The Big Kernel Lock"
-       depends on SMP || PREEMPT
-       default y
-       help
-         This option reduces the latency of the kernel by making the
-         big kernel lock preemptible.
-
-         Say Y here if you are building a kernel for a desktop system.
-         Say N if you are unsure.
-
 config RCU_TRACE
        bool "Enable tracing for RCU - currently stats in debugfs"
        select DEBUG_FS