Commit a2ca5e03 authored by Frederic Weisbecker's avatar Frederic Weisbecker
Browse files

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: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
parent 1a0799a8

kernel/trace/trace_events.c

+26 −26
Original line number Diff line number Diff line
@@ -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,
@@ -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)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE