diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-11-16 03:50:34 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-11-16 03:52:03 -0500 |
commit | 227a837567e339c74d9d4243d03a29bd943a018c (patch) | |
tree | 21fd0955eb46f838c2a8a1a9bc6671270ffdaf3d | |
parent | 0a7ad64531713e33e39af95bdbfb172f4f328b1e (diff) |
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>
-rw-r--r-- | kernel/marker.c | 4 | ||||
-rw-r--r-- | kernel/tracepoint.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/kernel/marker.c b/kernel/marker.c index c14ec26a9b9f..ea54f2647868 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, | |||
896 | } | 896 | } |
897 | EXPORT_SYMBOL_GPL(marker_get_private_data); | 897 | EXPORT_SYMBOL_GPL(marker_get_private_data); |
898 | 898 | ||
899 | #ifdef CONFIG_MODULES | ||
900 | |||
899 | int marker_module_notify(struct notifier_block *self, | 901 | int marker_module_notify(struct notifier_block *self, |
900 | unsigned long val, void *data) | 902 | unsigned long val, void *data) |
901 | { | 903 | { |
@@ -924,3 +926,5 @@ static int init_markers(void) | |||
924 | return register_module_notifier(&marker_module_nb); | 926 | return register_module_notifier(&marker_module_nb); |
925 | } | 927 | } |
926 | __initcall(init_markers); | 928 | __initcall(init_markers); |
929 | |||
930 | #endif /* CONFIG_MODULES */ | ||
diff --git a/kernel/tracepoint.c b/kernel/tracepoint.c index 94ac4e35530d..79602740bbb5 100644 --- a/kernel/tracepoint.c +++ b/kernel/tracepoint.c | |||
@@ -542,6 +542,8 @@ void tracepoint_iter_reset(struct tracepoint_iter *iter) | |||
542 | } | 542 | } |
543 | EXPORT_SYMBOL_GPL(tracepoint_iter_reset); | 543 | EXPORT_SYMBOL_GPL(tracepoint_iter_reset); |
544 | 544 | ||
545 | #ifdef CONFIG_MODULES | ||
546 | |||
545 | int tracepoint_module_notify(struct notifier_block *self, | 547 | int tracepoint_module_notify(struct notifier_block *self, |
546 | unsigned long val, void *data) | 548 | unsigned long val, void *data) |
547 | { | 549 | { |
@@ -570,3 +572,5 @@ static int init_tracepoints(void) | |||
570 | return register_module_notifier(&tracepoint_module_nb); | 572 | return register_module_notifier(&tracepoint_module_nb); |
571 | } | 573 | } |
572 | __initcall(init_tracepoints); | 574 | __initcall(init_tracepoints); |
575 | |||
576 | #endif /* CONFIG_MODULES */ | ||