]>
Commit | Line | Data |
---|---|---|
e099ab40 BS |
1 | --- a/linux/include/linux/module.h 2009-07-27 09:39:26.000000000 +0000 |
2 | +++ b/linux/include/linux/module.h 2009-07-27 09:17:57.000000000 +0000 | |
3 | @@ -16,6 +16,7 @@ | |
4 | #include <linux/kobject.h> | |
5 | #include <linux/moduleparam.h> | |
6 | #include <linux/marker.h> | |
7 | +#include <linux/tracepoint.h> | |
8 | #include <asm/local.h> | |
9 | ||
10 | #include <asm/module.h> | |
11 | @@ -332,6 +333,11 @@ | |
12 | unsigned int num_markers; | |
13 | #endif | |
14 | ||
15 | +#ifdef CONFIG_TRACEPOINTS | |
16 | + struct tracepoint *tracepoints; | |
17 | + unsigned int num_tracepoints; | |
18 | +#endif | |
19 | + | |
20 | #ifdef CONFIG_MODULE_UNLOAD | |
21 | /* What modules depend on me? */ | |
22 | struct list_head modules_which_use_me; | |
23 | @@ -343,9 +349,8 @@ | |
24 | void (*exit)(void); | |
25 | ||
26 | /* Reference counts */ | |
27 | - struct module_ref ref[NR_CPUS]; | |
28 | + struct module_ref *ref; | |
29 | #endif | |
30 | - | |
31 | }; | |
32 | #ifndef MODULE_ARCH_INIT | |
33 | #define MODULE_ARCH_INIT {} | |
34 | @@ -363,6 +368,7 @@ | |
35 | struct module *module_text_address(unsigned long addr); | |
36 | struct module *__module_text_address(unsigned long addr); | |
37 | int is_module_address(unsigned long addr); | |
38 | +const char *supported_printable(int taint); | |
39 | ||
40 | /* Returns 0 and fills in value, defined and namebuf, or -ERANGE if | |
41 | symnum out of range. */ | |
42 | @@ -453,6 +459,9 @@ | |
43 | ||
44 | extern void module_update_markers(void); | |
45 | ||
46 | +extern void module_update_tracepoints(void); | |
47 | +extern int module_get_iter_tracepoints(struct tracepoint_iter *iter); | |
48 | + | |
49 | #else /* !CONFIG_MODULES... */ | |
50 | #define EXPORT_SYMBOL(sym) | |
51 | #define EXPORT_SYMBOL_GPL(sym) | |
52 | @@ -557,6 +566,15 @@ | |
53 | { | |
54 | } | |
55 | ||
56 | +static inline void module_update_tracepoints(void) | |
57 | +{ | |
58 | +} | |
59 | + | |
60 | +static inline int module_get_iter_tracepoints(struct tracepoint_iter *iter) | |
61 | +{ | |
62 | + return 0; | |
63 | +} | |
64 | + | |
65 | #endif /* CONFIG_MODULES */ | |
66 | ||
67 | struct device_driver; |