Skip to content

Commit

Permalink
Merge tag 'trace-v4.5-rc1-2' of git://git.kernel.org/pub/scm/linux/ke…
Browse files Browse the repository at this point in the history
…rnel/git/rostedt/linux-trace

Pull tracing fix from Steven Rostedt:
 "A cleanup to the stack tracer broke stack tracing on s390.  Here's a
  simple fix to correct that issue"

* tag 'trace-v4.5-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing/stacktrace: Show entire trace if passed in function not found
  • Loading branch information
torvalds committed Feb 3, 2016
2 parents 4643536 + 6ccd837 commit ef582d0
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions kernel/trace/trace_stack.c
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,13 @@ check_stack(unsigned long ip, unsigned long *stack)
break;
}

/*
* Some archs may not have the passed in ip in the dump.
* If that happens, we need to show everything.
*/
if (i == stack_trace_max.nr_entries)
i = 0;

/*
* Now find where in the stack these are.
*/
Expand Down

0 comments on commit ef582d0

Please sign in to comment.