diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-10 15:06:57 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-10 15:06:57 +1000 |
commit | a752b6aec60fecfcb7ec68de5433b4a49e5564ef (patch) | |
tree | 6bcbb0207fefb6d7090853f9ae3a81da1b134025 /kernel/trace/trace_stack.c | |
parent | ba896d7c0ddf3da695e31bd3eb9706e358a79ba6 (diff) | |
parent | 3cc8493163ef13804c6cbd614d14bd83b03194a8 (diff) |
Merge commit 'tracing/auto-tracing-next'
Conflicts:
block/blk-sysfs.c
net/core/drop_monitor.c
net/core/net-traces.c
Diffstat (limited to 'kernel/trace/trace_stack.c')
-rw-r--r-- | kernel/trace/trace_stack.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c index c750f65f9661..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) seq_printf(m, " Depth Size Location" " (%d entries)\n" " ----- ---- --------\n", - max_stack_trace.nr_entries); + max_stack_trace.nr_entries - 1); if (!stack_tracer_enabled && !max_stack_size) print_disabled(m); @@ -352,19 +352,14 @@ __setup("stacktrace", enable_stacktrace); static __init int stack_trace_init(void) { struct dentry *d_tracer; - struct dentry *entry; d_tracer = tracing_init_dentry(); - entry = debugfs_create_file("stack_max_size", 0644, d_tracer, - &max_stack_size, &stack_max_size_fops); - if (!entry) - pr_warning("Could not create debugfs 'stack_max_size' entry\n"); + trace_create_file("stack_max_size", 0644, d_tracer, + &max_stack_size, &stack_max_size_fops); - entry = debugfs_create_file("stack_trace", 0444, d_tracer, - NULL, &stack_trace_fops); - if (!entry) - pr_warning("Could not create debugfs 'stack_trace' entry\n"); + trace_create_file("stack_trace", 0444, d_tracer, + NULL, &stack_trace_fops); if (stack_tracer_enabled) register_ftrace_function(&trace_ops); |