diff options
Diffstat (limited to 'include/linux/module.h')
-rw-r--r-- | include/linux/module.h | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/include/linux/module.h b/include/linux/module.h index a41555cbe00..3bfed013350 100644 --- a/include/linux/module.h +++ b/include/linux/module.h | |||
@@ -16,6 +16,7 @@ | |||
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> | 18 | #include <linux/marker.h> |
19 | #include <linux/tracepoint.h> | ||
19 | #include <asm/local.h> | 20 | #include <asm/local.h> |
20 | 21 | ||
21 | #include <asm/module.h> | 22 | #include <asm/module.h> |
@@ -28,7 +29,7 @@ | |||
28 | #define MODULE_SYMBOL_PREFIX "" | 29 | #define MODULE_SYMBOL_PREFIX "" |
29 | #endif | 30 | #endif |
30 | 31 | ||
31 | #define MODULE_NAME_LEN (64 - sizeof(unsigned long)) | 32 | #define MODULE_NAME_LEN MAX_PARAM_PREFIX_LEN |
32 | 33 | ||
33 | struct kernel_symbol | 34 | struct kernel_symbol |
34 | { | 35 | { |
@@ -59,6 +60,7 @@ struct module_kobject | |||
59 | struct kobject kobj; | 60 | struct kobject kobj; |
60 | struct module *mod; | 61 | struct module *mod; |
61 | struct kobject *drivers_dir; | 62 | struct kobject *drivers_dir; |
63 | struct module_param_attrs *mp; | ||
62 | }; | 64 | }; |
63 | 65 | ||
64 | /* These are either module local, or the kernel's dummy ones. */ | 66 | /* These are either module local, or the kernel's dummy ones. */ |
@@ -241,7 +243,6 @@ struct module | |||
241 | 243 | ||
242 | /* Sysfs stuff. */ | 244 | /* Sysfs stuff. */ |
243 | struct module_kobject mkobj; | 245 | struct module_kobject mkobj; |
244 | struct module_param_attrs *param_attrs; | ||
245 | struct module_attribute *modinfo_attrs; | 246 | struct module_attribute *modinfo_attrs; |
246 | const char *version; | 247 | const char *version; |
247 | const char *srcversion; | 248 | const char *srcversion; |
@@ -276,7 +277,7 @@ struct module | |||
276 | 277 | ||
277 | /* Exception table */ | 278 | /* Exception table */ |
278 | unsigned int num_exentries; | 279 | unsigned int num_exentries; |
279 | const struct exception_table_entry *extable; | 280 | struct exception_table_entry *extable; |
280 | 281 | ||
281 | /* Startup function. */ | 282 | /* Startup function. */ |
282 | int (*init)(void); | 283 | int (*init)(void); |
@@ -331,6 +332,10 @@ struct module | |||
331 | struct marker *markers; | 332 | struct marker *markers; |
332 | unsigned int num_markers; | 333 | unsigned int num_markers; |
333 | #endif | 334 | #endif |
335 | #ifdef CONFIG_TRACEPOINTS | ||
336 | struct tracepoint *tracepoints; | ||
337 | unsigned int num_tracepoints; | ||
338 | #endif | ||
334 | 339 | ||
335 | #ifdef CONFIG_MODULE_UNLOAD | 340 | #ifdef CONFIG_MODULE_UNLOAD |
336 | /* What modules depend on me? */ | 341 | /* What modules depend on me? */ |
@@ -453,6 +458,9 @@ extern void print_modules(void); | |||
453 | 458 | ||
454 | extern void module_update_markers(void); | 459 | extern void module_update_markers(void); |
455 | 460 | ||
461 | extern void module_update_tracepoints(void); | ||
462 | extern int module_get_iter_tracepoints(struct tracepoint_iter *iter); | ||
463 | |||
456 | #else /* !CONFIG_MODULES... */ | 464 | #else /* !CONFIG_MODULES... */ |
457 | #define EXPORT_SYMBOL(sym) | 465 | #define EXPORT_SYMBOL(sym) |
458 | #define EXPORT_SYMBOL_GPL(sym) | 466 | #define EXPORT_SYMBOL_GPL(sym) |
@@ -557,6 +565,15 @@ static inline void module_update_markers(void) | |||
557 | { | 565 | { |
558 | } | 566 | } |
559 | 567 | ||
568 | static inline void module_update_tracepoints(void) | ||
569 | { | ||
570 | } | ||
571 | |||
572 | static inline int module_get_iter_tracepoints(struct tracepoint_iter *iter) | ||
573 | { | ||
574 | return 0; | ||
575 | } | ||
576 | |||
560 | #endif /* CONFIG_MODULES */ | 577 | #endif /* CONFIG_MODULES */ |
561 | 578 | ||
562 | struct device_driver; | 579 | struct device_driver; |