[PATCH] markers/tracpoints: fix non-modular build

Ingo Molnar
2008-11-16T08:53:20Z

* Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca> wrote:

> Use module notifiers instead of adding a hook in module.c.
>
> Impact: cleanup.
>
> Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
> CC: 'Ingo Molnar' <mingo@elte.hu>
> CC: Lai Jiangshan <laijs@cn.fujitsu.com>
> ---
> kernel/marker.c | 29 +++++++++++++++++++++++++++++
> kernel/module.c | 4 ----
> 2 files changed, 29 insertions(+), 4 deletions(-)

>From 227a837567e339c74d9d4243d03a29bd943a018c Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Sun, 16 Nov 2008 09:50:34 +0100
Subject: [PATCH] markers/tracpoints: fix non-modular build

fix:

kernel/marker.c: In function 'marker_module_notify':
kernel/marker.c:905: error: 'MODULE_STATE_COMING' undeclared (first use in this function)
[...]

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
kernel/marker.c | 4 ++++
kernel/tracepoint.c | 4 ++++
2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/kernel/marker.c b/kernel/marker.c
index c14ec26..ea54f26 100644
--- a/kernel/marker.c
+++ b/kernel/marker.c
@@ -896,6 +896,8 @@ void *marker_get_private_data(const char *name, marker_probe_func *probe,
}
EXPORT_SYMBOL_GPL(marker_get_private_data);

+#ifdef CONFIG_MODULES
+
int marker_module_notify(struct notifier_block *self,
unsigned long val, void *data)
{
@@ -924,3 +926,5 @@ static int init_markers(void)
return register_module_notifier(&marker_module_nb);
}
__initcall(init_markers);
+
+#endif /* CONFIG_MODULES */
diff --git a/kernel/tracepoint.c b/kernel/tracepoint.c
index 94ac4e3..7960274 100644
--- a/kernel/tracepoint.c
+++ b/kernel/tracepoint.c
@@ -542,6 +542,8 @@ void tracepoint_iter_reset(struct tracepoint_iter *iter)
}
EXPORT_SYMBOL_GPL(tracepoint_iter_reset);

+#ifdef CONFIG_MODULES
+
int tracepoint_module_notify(struct notifier_block *self,
unsigned long val, void *data)
{
@@ -570,3 +572,5 @@ static int init_tracepoints(void)
return register_module_notifier(&tracepoint_module_nb);
}
__initcall(init_tracepoints);
+
+#endif /* CONFIG_MODULES */