aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2009-04-14 18:22:32 -0400
committerSteven Rostedt <rostedt@goodmis.org>2009-04-14 22:04:19 -0400
commit61f919a12fbdc3fd20f980a34a118d597198a392 (patch)
tree0c8ee118fabb29ff2c0be699948cb4b00627b543
parent6d723736e472f7a0cd5b62c84152fceead241328 (diff)
tracing/events: fix compile for modules disabled
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>
-rw-r--r--kernel/trace/trace_events.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index a4b177720a6..6591d83e1e7 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -797,6 +797,7 @@ event_create_dir(struct ftrace_event_call *call, struct dentry *d_events)
(unsigned long)event < (unsigned long)end; \
event++)
+#ifdef CONFIG_MODULES
static void trace_module_add_events(struct module *mod)
{
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,
- unsigned long val, void *data)
+static int trace_module_notify(struct notifier_block *self,
+ unsigned long val, void *data)
{
struct module *mod = data;
@@ -858,6 +859,13 @@ int trace_module_notify(struct notifier_block *self,
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 = {
.notifier_call = trace_module_notify,