diff --git a/[refs] b/[refs] index e49fcefd331e..9942dc1ada90 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 446f713ba1afd68568139ae4691335ba273fa7f4 +refs/heads/master: eef5e0d185fc049bda11fa14ba286fbd357da896 diff --git a/trunk/kernel/lockdep.c b/trunk/kernel/lockdep.c index c9fefdb1a7db..9bb8d784eb02 100644 --- a/trunk/kernel/lockdep.c +++ b/trunk/kernel/lockdep.c @@ -228,11 +228,7 @@ 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;