diff --git a/[refs] b/[refs]
index 10385f98e0ac..ee4eed465d7c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bdd4e85dc36cdbcfc1608a5b2a17c80a9db8986a
+refs/heads/master: e8f7c70f44f75c827c04239b0ae5f0068b65b76e
diff --git a/trunk/lib/Kconfig.debug b/trunk/lib/Kconfig.debug
index 28afa4c5333c..a7dd7b547fea 100644
--- a/trunk/lib/Kconfig.debug
+++ b/trunk/lib/Kconfig.debug
@@ -650,6 +650,7 @@ config TRACE_IRQFLAGS
 
 config DEBUG_SPINLOCK_SLEEP
 	bool "Spinlock debugging: sleep-inside-spinlock checking"
+	select PREEMPT_COUNT
 	depends on DEBUG_KERNEL
 	help
 	  If you say Y here, various routines which may sleep will become very