Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141025
b: refs/heads/master
c: 9a8118b
h: refs/heads/master
i:
  141023: ba49a64
v: v3
  • Loading branch information
Tom Zanussi authored and Ingo Molnar committed Mar 26, 2009
1 parent ba66742 commit fbc3f34
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 14 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9f58a159d022c8f2533a27708aa267adf4f0e3ce
refs/heads/master: 9a8118baaeb0eaa148913bed77bf9c6335f6ca63
18 changes: 5 additions & 13 deletions trunk/kernel/trace/trace_events.c
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,6 @@ static struct dentry *
event_subsystem_dir(const char *name, struct dentry *d_events)
{
struct event_subsystem *system;
struct dentry *entry;

/* First see if we did not already create this dir */
list_for_each_entry(system, &event_subsystems, list) {
Expand Down Expand Up @@ -709,12 +708,6 @@ event_subsystem_dir(const char *name, struct dentry *d_events)

system->preds = NULL;

entry = debugfs_create_file("filter", 0644, system->entry, system,
&ftrace_subsystem_filter_fops);
if (!entry)
pr_warning("Could not create debugfs "
"'%s/filter' entry\n", name);

return system->entry;
}

Expand Down Expand Up @@ -770,14 +763,13 @@ event_create_dir(struct ftrace_event_call *call, struct dentry *d_events)
" events/%s\n", call->name);
return ret;
}
entry = debugfs_create_file("filter", 0644, call->dir, call,
&ftrace_event_filter_fops);
if (!entry)
pr_warning("Could not create debugfs "
"'%s/filter' entry\n", call->name);
}

entry = debugfs_create_file("filter", 0644, call->dir, call,
&ftrace_event_filter_fops);
if (!entry)
pr_warning("Could not create debugfs "
"'%s/filter' entry\n", call->name);

/* A trace may not want to export its format */
if (!call->show_format)
return 0;
Expand Down

0 comments on commit fbc3f34

Please sign in to comment.