diff --git a/[refs] b/[refs]
index 60475f9d566b..af011d30fcc3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3b4adfa65bae300a143188491e285556ca80fff
+refs/heads/master: bdcab87b1c54f61dbc0a77648fee4c2b17964d5c
diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig
index 0ae541107f3f..37b91017818d 100644
--- a/trunk/arch/sh/Kconfig
+++ b/trunk/arch/sh/Kconfig
@@ -63,6 +63,10 @@ config GENERIC_TIME
 config GENERIC_CLOCKEVENTS
 	def_bool n
 
+config GENERIC_LOCKBREAK
+	def_bool y
+	depends on SMP && PREEMPT
+
 config SYS_SUPPORTS_PM
 	bool