diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2015-02-02 17:47:31 +0100 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2015-02-02 17:47:31 +0100 |
| commit | dfbc1534eac550b37df592a8a0b550cd47539d0b (patch) | |
| tree | ec2f50ac271be0bad556e5e22a204bddc1f63a9a /kernel/trace/trace.c | |
| parent | tracing: Separate out initializing top level dir from instances (diff) | |
| parent | debugfs: Provide a file creation function that also takes an initial size (diff) | |
| download | linux-dfbc1534eac550b37df592a8a0b550cd47539d0b.tar.xz linux-dfbc1534eac550b37df592a8a0b550cd47539d0b.zip | |
Merge branch 'debugfs_automount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs into trace/ftrace/tracefs
Pull in Al Viro's changes to debugfs that implement the new primitive:
debugfs_create_automount(), that creates a directory in debugfs that will
safely mount another file system automatically when debugfs is mounted.
This will let tracefs automount itself on top of debugfs/tracing directory.
Diffstat (limited to 'kernel/trace/trace.c')
| -rw-r--r-- | kernel/trace/trace.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 5afce60e1b68..38c613ede10d 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -6888,7 +6888,6 @@ void __init trace_init(void) tracepoint_printk = 0; } tracer_alloc_buffers(); - init_ftrace_syscalls(); trace_event_init(); } |