diff --git a/[refs] b/[refs] index 850683acc72e..6ba0ea866b4f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e14af7eeb47ea96c52741c5e5fa010d33daf6973 +refs/heads/master: 58b8a73ab8becfcaea84abc2a06038281efa4c8a diff --git a/trunk/kernel/Kconfig.preempt b/trunk/kernel/Kconfig.preempt index 61fa116efcde..4420ef427f83 100644 --- a/trunk/kernel/Kconfig.preempt +++ b/trunk/kernel/Kconfig.preempt @@ -53,15 +53,8 @@ config PREEMPT endchoice config PREEMPT_BKL - bool "Preempt The Big Kernel Lock" + def_bool y 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"