diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-26 10:13:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-26 10:13:54 -0700 |
| commit | 4187e7e9f1294afdcb3be5d00aa74412a1c2ded8 (patch) | |
| tree | 1d4b3447cb2a7407d97e51ee5c48069d6b92c9e3 /kernel/module.c | |
| parent | 5bb241b325d7d91bc4ec0b394f31dffb17fe7978 (diff) | |
| parent | 115e8a288252ef748f34f8b7c1115c563d702eda (diff) | |
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
modules, tracing: Remove stale struct marker signature from module_layout()
tracing/workqueue: Use %pf in workqueue trace events
tracing: Fix a comment and a trivial format issue in tracepoint.h
tracing: Fix failure path in ftrace_regex_open()
tracing: Fix failure path in ftrace_graph_write()
tracing: Check the return value of trace_get_user()
tracing: Fix off-by-one in trace_get_user()
Diffstat (limited to 'kernel/module.c')
| -rw-r--r-- | kernel/module.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/module.c b/kernel/module.c index 5a29397ca4b6..fe748a86d452 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -3091,7 +3091,6 @@ void module_layout(struct module *mod, struct modversion_info *ver, struct kernel_param *kp, struct kernel_symbol *ks, - struct marker *marker, struct tracepoint *tp) { } |