diff --git a/[refs] b/[refs]
index 4104128226f0..5f2bb837e060 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d9fb0038a9b02febb01efc79a4a5d97f1822a90
+refs/heads/master: f1898f6be9a2e3690fb62d8307849b86a89cc36c
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index e91c7cdc6fe5..e4191ccbdb7a 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/arch/arm/Kconfig
@@ -126,11 +126,6 @@ config TRACE_IRQFLAGS_SUPPORT
 	bool
 	default y
 
-config GENERIC_LOCKBREAK
-	bool
-	default y
-	depends on SMP && PREEMPT
-
 config RWSEM_GENERIC_SPINLOCK
 	bool
 	default y