Skip to content

Commit

Permalink
tracing/events: Only define remove_subsystem_dir() if CONFIG_MODULES
Browse files Browse the repository at this point in the history
If we disable modules, we get the following warning in ftrace events
file:

kernel/trace/trace_events.c:912: attention : ‘remove_subsystem_dir’ defined but not used

remove_subystem_dir() is useless if !CONFIG_MODULES, then move it to
the appropriate #ifdef section of trace_events.c

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
  • Loading branch information
Frederic Weisbecker committed Aug 6, 2009
1 parent 1a0799a commit a2ca5e0
Showing 1 changed file with 26 additions and 26 deletions.
52 changes: 26 additions & 26 deletions kernel/trace/trace_events.c
Original file line number Diff line number Diff line change
Expand Up @@ -908,32 +908,6 @@ event_subsystem_dir(const char *name, struct dentry *d_events)
return system->entry;
}

static void remove_subsystem_dir(const char *name)
{
struct event_subsystem *system;

if (strcmp(name, TRACE_SYSTEM) == 0)
return;

list_for_each_entry(system, &event_subsystems, list) {
if (strcmp(system->name, name) == 0) {
if (!--system->nr_events) {
struct event_filter *filter = system->filter;

debugfs_remove_recursive(system->entry);
list_del(&system->list);
if (filter) {
kfree(filter->filter_string);
kfree(filter);
}
kfree(system->name);
kfree(system);
}
break;
}
}
}

static int
event_create_dir(struct ftrace_event_call *call, struct dentry *d_events,
const struct file_operations *id,
Expand Down Expand Up @@ -1018,6 +992,32 @@ struct ftrace_module_file_ops {
struct file_operations filter;
};

static void remove_subsystem_dir(const char *name)
{
struct event_subsystem *system;

if (strcmp(name, TRACE_SYSTEM) == 0)
return;

list_for_each_entry(system, &event_subsystems, list) {
if (strcmp(system->name, name) == 0) {
if (!--system->nr_events) {
struct event_filter *filter = system->filter;

debugfs_remove_recursive(system->entry);
list_del(&system->list);
if (filter) {
kfree(filter->filter_string);
kfree(filter);
}
kfree(system->name);
kfree(system);
}
break;
}
}
}

static struct ftrace_module_file_ops *
trace_create_file_ops(struct module *mod)
{
Expand Down

0 comments on commit a2ca5e0

Please sign in to comment.