diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-26 13:13:54 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-26 13:13:54 -0400 |
| commit | 4187e7e9f1294afdcb3be5d00aa74412a1c2ded8 (patch) | |
| tree | 1d4b3447cb2a7407d97e51ee5c48069d6b92c9e3 /include/linux | |
| 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 'include/linux')
| -rw-r--r-- | include/linux/tracepoint.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h index 660a9de96f81..2aac8a83e89b 100644 --- a/include/linux/tracepoint.h +++ b/include/linux/tracepoint.h | |||
| @@ -36,7 +36,7 @@ struct tracepoint { | |||
| 36 | #ifndef DECLARE_TRACE | 36 | #ifndef DECLARE_TRACE |
| 37 | 37 | ||
| 38 | #define TP_PROTO(args...) args | 38 | #define TP_PROTO(args...) args |
| 39 | #define TP_ARGS(args...) args | 39 | #define TP_ARGS(args...) args |
| 40 | 40 | ||
| 41 | #ifdef CONFIG_TRACEPOINTS | 41 | #ifdef CONFIG_TRACEPOINTS |
| 42 | 42 | ||