lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tracing/events: fix compile for modules disabled

Browse Source 
Impact: compile fix

The addition of TRACE_EVENT for modules breaks the build for when
modules are disabled. This code fixes that.

Reported-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
Steven Rostedt
2009-04-14 18:22:32 -04:00
committed by Steven Rostedt
parent 6d723736e4
commit 61f919a12f
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
kernel/trace/trace_events.c
View File

@@ -797,6 +797,7 @@ event_create_dir(struct ftrace_event_call *call, struct dentry *d_events)
(unsigned long)event < (unsigned long)end; \ (unsigned long)event < (unsigned long)end; \
event++) event++)
#ifdef CONFIG_MODULES
static void trace_module_add_events(struct module *mod) static void trace_module_add_events(struct module *mod)
{ {
struct ftrace_event_call *call, *start, *end; struct ftrace_event_call *call, *start, *end;
@@ -840,8 +841,8 @@ static void trace_module_remove_events(struct module *mod)
} }
} }
int trace_module_notify(struct notifier_block *self, static int trace_module_notify(struct notifier_block *self,
unsigned long val, void *data) unsigned long val, void *data)
{ {
struct module *mod = data; struct module *mod = data;
@@ -858,6 +859,13 @@ int trace_module_notify(struct notifier_block *self,
return 0; return 0;
} }
#else
static int trace_module_notify(struct notifier_block *self,
unsigned long val, void *data)
{
return 0;
}
#endif /* CONFIG_MODULES */
struct notifier_block trace_module_nb = { struct notifier_block trace_module_nb = {
.notifier_call = trace_module_notify, .notifier_call = trace_module_notify,