diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-05 10:50:29 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-05 10:50:29 -0400 |
| commit | 918143e8b7d6153d7a83a3f854323407939f4a7e (patch) | |
| tree | 34c0b1434516d146fc3811a6d071b052dd59342b /kernel/trace/trace_stack.c | |
| parent | 64edbc562034f2ec3fce382cb208fab40586d005 (diff) | |
| parent | 563af16c30ede41eda2d614195d88e07f7c7103d (diff) | |
Merge branch 'tip/tracing/ftrace-4' 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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c index 1796f00524e1..2d7aebd71dbd 100644 --- a/kernel/trace/trace_stack.c +++ b/kernel/trace/trace_stack.c | |||
| @@ -265,7 +265,7 @@ static int t_show(struct seq_file *m, void *v) | |||
| 265 | seq_printf(m, " Depth Size Location" | 265 | seq_printf(m, " Depth Size Location" |
| 266 | " (%d entries)\n" | 266 | " (%d entries)\n" |
| 267 | " ----- ---- --------\n", | 267 | " ----- ---- --------\n", |
| 268 | max_stack_trace.nr_entries); | 268 | max_stack_trace.nr_entries - 1); |
| 269 | 269 | ||
| 270 | if (!stack_tracer_enabled && !max_stack_size) | 270 | if (!stack_tracer_enabled && !max_stack_size) |
| 271 | print_disabled(m); | 271 | print_disabled(m); |