diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-05 12:53:21 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-05 12:53:21 -0500 |
commit | 7a797cdcca2b3c0031e580203f18d6c9483aaec5 (patch) | |
tree | e35526b99793c08fd76c9a41e969c1c070adcc51 /include | |
parent | bb2166c898adb5fe29bc450004926802d2a16035 (diff) | |
parent | c13d2f7c3231e873f30db92b96c8caa48f100f33 (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:
tracing: Fix trace_marker output
tracing: Fix event format export
tracing: Fix return value of tracing_stats_read()
Diffstat (limited to 'include')
-rw-r--r-- | include/trace/ftrace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h index cc0d9667e182..dacb8ef67000 100644 --- a/include/trace/ftrace.h +++ b/include/trace/ftrace.h | |||
@@ -159,7 +159,7 @@ | |||
159 | #undef __get_str | 159 | #undef __get_str |
160 | 160 | ||
161 | #undef TP_printk | 161 | #undef TP_printk |
162 | #define TP_printk(fmt, args...) "%s, %s\n", #fmt, __stringify(args) | 162 | #define TP_printk(fmt, args...) "\"%s\", %s\n", fmt, __stringify(args) |
163 | 163 | ||
164 | #undef TP_fast_assign | 164 | #undef TP_fast_assign |
165 | #define TP_fast_assign(args...) args | 165 | #define TP_fast_assign(args...) args |