diff --git a/[refs] b/[refs] index 11dd8fc29f70..04b52873ed36 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cc19ca86a023fcd552c78e77a7be6ce271f92a28 +refs/heads/master: f704f56af95bec3c1ca719d64d0becef74d40899 diff --git a/trunk/kernel/Kconfig.preempt b/trunk/kernel/Kconfig.preempt index 587328be8216..34c631221aa3 100644 --- a/trunk/kernel/Kconfig.preempt +++ b/trunk/kernel/Kconfig.preempt @@ -13,7 +13,7 @@ config PREEMPT config PREEMPT_BKL bool "Preempt The Big Kernel Lock" - depends on PREEMPT + depends on SMP || PREEMPT default y help This option reduces the latency of the kernel by making the