summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-02-03 09:31:34 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-02-03 09:31:34 -0800
commitef582d095db13504a54b9bc57c9489e551441c2a (patch)
tree7528c1a68abd117264a103b36216df6f09442ec8 /kernel
parent464353647427793aef800503ec42acb68e95d9e2 (diff)
parent6ccd83714a009ee301b50c15f6c3a5dc1f30164c (diff)
downloadlinux-ef582d095db13504a54b9bc57c9489e551441c2a.tar.bz2
Merge tag 'trace-v4.5-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/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
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/trace_stack.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
index dda9e6742950..202df6cffcca 100644
--- a/kernel/trace/trace_stack.c
+++ b/kernel/trace/trace_stack.c
@@ -126,6 +126,13 @@ check_stack(unsigned long ip, unsigned long *stack)
}
/*
+ * 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.
*/
x = 0;