Skip to content

Commit a2ca5e0

Browse files
committed
tracing/events: Only define remove_subsystem_dir() if CONFIG_MODULES
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 <[email protected]> Cc: Steven Rostedt <[email protected]>
1 parent 1a0799a commit a2ca5e0

File tree

1 file changed

+26
-26
lines changed

1 file changed

+26
-26
lines changed

kernel/trace/trace_events.c

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -908,32 +908,6 @@ event_subsystem_dir(const char *name, struct dentry *d_events)
908908
return system->entry;
909909
}
910910

911-
static void remove_subsystem_dir(const char *name)
912-
{
913-
struct event_subsystem *system;
914-
915-
if (strcmp(name, TRACE_SYSTEM) == 0)
916-
return;
917-
918-
list_for_each_entry(system, &event_subsystems, list) {
919-
if (strcmp(system->name, name) == 0) {
920-
if (!--system->nr_events) {
921-
struct event_filter *filter = system->filter;
922-
923-
debugfs_remove_recursive(system->entry);
924-
list_del(&system->list);
925-
if (filter) {
926-
kfree(filter->filter_string);
927-
kfree(filter);
928-
}
929-
kfree(system->name);
930-
kfree(system);
931-
}
932-
break;
933-
}
934-
}
935-
}
936-
937911
static int
938912
event_create_dir(struct ftrace_event_call *call, struct dentry *d_events,
939913
const struct file_operations *id,
@@ -1018,6 +992,32 @@ struct ftrace_module_file_ops {
1018992
struct file_operations filter;
1019993
};
1020994

995+
static void remove_subsystem_dir(const char *name)
996+
{
997+
struct event_subsystem *system;
998+
999+
if (strcmp(name, TRACE_SYSTEM) == 0)
1000+
return;
1001+
1002+
list_for_each_entry(system, &event_subsystems, list) {
1003+
if (strcmp(system->name, name) == 0) {
1004+
if (!--system->nr_events) {
1005+
struct event_filter *filter = system->filter;
1006+
1007+
debugfs_remove_recursive(system->entry);
1008+
list_del(&system->list);
1009+
if (filter) {
1010+
kfree(filter->filter_string);
1011+
kfree(filter);
1012+
}
1013+
kfree(system->name);
1014+
kfree(system);
1015+
}
1016+
break;
1017+
}
1018+
}
1019+
}
1020+
10211021
static struct ftrace_module_file_ops *
10221022
trace_create_file_ops(struct module *mod)
10231023
{

0 commit comments

Comments
 (0)