diff options
author | Christoph Hellwig <hch@lst.de> | 2009-09-17 13:35:28 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-09-18 15:22:08 -0400 |
commit | fc5377668c3d808e1d53c4aee152c836f55c3490 (patch) | |
tree | 366723ccb26a64c311074c346721aaf4ff0e7d58 /include/linux/module.h | |
parent | df58bee21ed218cb7dfb561a590b1bd2a99531cf (diff) |
tracing: Remove markers
Now that the last users of markers have migrated to the event
tracer we can kill off the (now orphan) support code.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
LKML-Reference: <20090917173527.GA1699@lst.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/module.h')
-rw-r--r-- | include/linux/module.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/include/linux/module.h b/include/linux/module.h index f8f92d015efe..1c755b2f937d 100644 --- a/include/linux/module.h +++ b/include/linux/module.h | |||
@@ -15,7 +15,6 @@ | |||
15 | #include <linux/stringify.h> | 15 | #include <linux/stringify.h> |
16 | #include <linux/kobject.h> | 16 | #include <linux/kobject.h> |
17 | #include <linux/moduleparam.h> | 17 | #include <linux/moduleparam.h> |
18 | #include <linux/marker.h> | ||
19 | #include <linux/tracepoint.h> | 18 | #include <linux/tracepoint.h> |
20 | 19 | ||
21 | #include <asm/local.h> | 20 | #include <asm/local.h> |
@@ -327,10 +326,6 @@ struct module | |||
327 | /* The command line arguments (may be mangled). People like | 326 | /* The command line arguments (may be mangled). People like |
328 | keeping pointers to this stuff */ | 327 | keeping pointers to this stuff */ |
329 | char *args; | 328 | char *args; |
330 | #ifdef CONFIG_MARKERS | ||
331 | struct marker *markers; | ||
332 | unsigned int num_markers; | ||
333 | #endif | ||
334 | #ifdef CONFIG_TRACEPOINTS | 329 | #ifdef CONFIG_TRACEPOINTS |
335 | struct tracepoint *tracepoints; | 330 | struct tracepoint *tracepoints; |
336 | unsigned int num_tracepoints; | 331 | unsigned int num_tracepoints; |
@@ -535,8 +530,6 @@ int unregister_module_notifier(struct notifier_block * nb); | |||
535 | 530 | ||
536 | extern void print_modules(void); | 531 | extern void print_modules(void); |
537 | 532 | ||
538 | extern void module_update_markers(void); | ||
539 | |||
540 | extern void module_update_tracepoints(void); | 533 | extern void module_update_tracepoints(void); |
541 | extern int module_get_iter_tracepoints(struct tracepoint_iter *iter); | 534 | extern int module_get_iter_tracepoints(struct tracepoint_iter *iter); |
542 | 535 | ||
@@ -651,10 +644,6 @@ static inline void print_modules(void) | |||
651 | { | 644 | { |
652 | } | 645 | } |
653 | 646 | ||
654 | static inline void module_update_markers(void) | ||
655 | { | ||
656 | } | ||
657 | |||
658 | static inline void module_update_tracepoints(void) | 647 | static inline void module_update_tracepoints(void) |
659 | { | 648 | { |
660 | } | 649 | } |