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_printk.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_printk.c')
-rw-r--r-- | kernel/trace/trace_printk.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/kernel/trace/trace_printk.c b/kernel/trace/trace_printk.c index eb81556107fe..9bece9687b62 100644 --- a/kernel/trace/trace_printk.c +++ b/kernel/trace/trace_printk.c @@ -245,17 +245,13 @@ static const struct file_operations ftrace_formats_fops = { static __init int init_trace_printk_function_export(void) { struct dentry *d_tracer; - struct dentry *entry; d_tracer = tracing_init_dentry(); if (!d_tracer) return 0; - entry = debugfs_create_file("printk_formats", 0444, d_tracer, + trace_create_file("printk_formats", 0444, d_tracer, NULL, &ftrace_formats_fops); - if (!entry) - pr_warning("Could not create debugfs " - "'printk_formats' entry\n"); return 0; } |