From 1e1415ca73e7849fbd2b9baf3ff680560467d151 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Sun, 16 Nov 2008 09:50:34 +0100
Subject: [PATCH] --- yaml --- r: 121149 b: refs/heads/master c:
 227a837567e339c74d9d4243d03a29bd943a018c h: refs/heads/master i:   121147:
 0856a0080b51fbedc6f2e1a482bd9e7615ca2c8e v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/marker.c     | 4 ++++
 trunk/kernel/tracepoint.c | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f559fdbdf5f3..5113672f9d71 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a7ad64531713e33e39af95bdbfb172f4f328b1e
+refs/heads/master: 227a837567e339c74d9d4243d03a29bd943a018c
diff --git a/trunk/kernel/marker.c b/trunk/kernel/marker.c
index c14ec26a9b9f..ea54f2647868 100644
--- a/trunk/kernel/marker.c
+++ b/trunk/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/trunk/kernel/tracepoint.c b/trunk/kernel/tracepoint.c
index 94ac4e35530d..79602740bbb5 100644
--- a/trunk/kernel/tracepoint.c
+++ b/trunk/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 */