aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace_stack.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-02-04 08:57:44 +0100
committerIngo Molnar <mingo@kernel.org>2016-02-04 08:57:44 +0100
commitb83ea91f08f648460b08e8980560abdf96060a19 (patch)
tree1a6db205770ed7103afe0aa1234dec0b1227f380 /kernel/trace/trace_stack.c
parentMerge tag 'perf-core-for-mingo-3' of git://git.kernel.org/pub/scm/linux/kerne... (diff)
parentMerge tag 'perf-urgent-for-mingo-2' of git://git.kernel.org/pub/scm/linux/ker... (diff)
downloadlinux-b83ea91f08f648460b08e8980560abdf96060a19.tar.gz
linux-b83ea91f08f648460b08e8980560abdf96060a19.zip
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/trace/trace_stack.c')
-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;