diff --git a/[refs] b/[refs]
index 0f2daa95bbd5..97d5f3a15445 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a1b3999d6cb7ab87f1f3b1700bc91839fd6fa29
+refs/heads/master: 3fa7c794fe4dc127f7fac3fad4d13628e68f89ce
diff --git a/trunk/kernel/lockdep.c b/trunk/kernel/lockdep.c
index 900b4cb1a024..c088e5542e84 100644
--- a/trunk/kernel/lockdep.c
+++ b/trunk/kernel/lockdep.c
@@ -227,7 +227,11 @@ static int save_trace(struct stack_trace *trace)
 	trace->skip = 3;
 	trace->all_contexts = 0;
 
+	/* Make sure to not recurse in case the the unwinder needs to tak
+e	   locks. */
+	lockdep_off();
 	save_stack_trace(trace, NULL);
+	lockdep_on();
 
 	trace->max_entries = trace->nr_entries;