aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace_stack.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-13 06:30:52 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-13 06:30:52 +0100
commitd2e82546ae98eee353fae57e389f487586fe380d (patch)
tree887c0885760763d2e6710f418108ec322fb492fd /kernel/trace/trace_stack.c
parentMerge commit 'v2.6.29-rc8' into tracing/ftrace (diff)
parentsoftirq: no need to have SOFTIRQ in softirq name (diff)
downloadlinux-d2e82546ae98eee353fae57e389f487586fe380d.tar.gz
linux-d2e82546ae98eee353fae57e389f487586fe380d.zip
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
Diffstat (limited to 'kernel/trace/trace_stack.c')
-rw-r--r--kernel/trace/trace_stack.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
index 91ccbf396c9a..c750f65f9661 100644
--- a/kernel/trace/trace_stack.c
+++ b/kernel/trace/trace_stack.c
@@ -262,9 +262,9 @@ static int t_show(struct seq_file *m, void *v)
int size;
if (v == SEQ_START_TOKEN) {
- seq_printf(m, " Depth Size Location"
+ seq_printf(m, " Depth Size Location"
" (%d entries)\n"
- " ----- ---- --------\n",
+ " ----- ---- --------\n",
max_stack_trace.nr_entries);
if (!stack_tracer_enabled && !max_stack_size)