diff --git a/[refs] b/[refs]
index c4a7aca11963..926d8a256127 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d18ef489509314506328b9e464dd47c24c1d68f
+refs/heads/master: 53b9d87f41a3d8838210ad7cdef02d814817ce85
diff --git a/trunk/include/linux/debug_locks.h b/trunk/include/linux/debug_locks.h
index 4aaa4afb1cb9..096476f1fb35 100644
--- a/trunk/include/linux/debug_locks.h
+++ b/trunk/include/linux/debug_locks.h
@@ -17,7 +17,7 @@ extern int debug_locks_off(void);
 ({									\
 	int __ret = 0;							\
 									\
-	if (unlikely(c)) {						\
+	if (!oops_in_progress && unlikely(c)) {				\
 		if (debug_locks_off() && !debug_locks_silent)		\
 			WARN_ON(1);					\
 		__ret = 1;						\