diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-06-11 02:01:14 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-06-11 02:01:14 -0400 |
| commit | cf9fe114e3b37e14fc8434d5abb192e35df551b1 (patch) | |
| tree | 0f82879295dc792f9df1a3ce79e143a3c073510f /include/linux/module.h | |
| parent | c1d0d32a603ed06377f404adf2c538de33bb3634 (diff) | |
| parent | 991ec02cdca33b03a132a0cacfe6f0aa0be9aa8d (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/module.h')
| -rw-r--r-- | include/linux/module.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/module.h b/include/linux/module.h index 627ac082e2a6..a8f2c0aa4c32 100644 --- a/include/linux/module.h +++ b/include/linux/module.h | |||
| @@ -337,6 +337,14 @@ struct module | |||
| 337 | const char **trace_bprintk_fmt_start; | 337 | const char **trace_bprintk_fmt_start; |
| 338 | unsigned int num_trace_bprintk_fmt; | 338 | unsigned int num_trace_bprintk_fmt; |
| 339 | #endif | 339 | #endif |
| 340 | #ifdef CONFIG_EVENT_TRACING | ||
| 341 | struct ftrace_event_call *trace_events; | ||
| 342 | unsigned int num_trace_events; | ||
| 343 | #endif | ||
| 344 | #ifdef CONFIG_FTRACE_MCOUNT_RECORD | ||
| 345 | unsigned long *ftrace_callsites; | ||
| 346 | unsigned int num_ftrace_callsites; | ||
| 347 | #endif | ||
| 340 | 348 | ||
| 341 | #ifdef CONFIG_MODULE_UNLOAD | 349 | #ifdef CONFIG_MODULE_UNLOAD |
| 342 | /* What modules depend on me? */ | 350 | /* What modules depend on me? */ |