Skip to contentSkip to conversation

tracing fixes for v2.6.33

GIT PULL Ingo Molnar 1 participant 1 message Dec 3, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest tracing-fixes-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git tracing-fixes-for-linus

These are the tracing fixes that spilled over from the last -rc cycle of v2.6.32.

Thanks,

Ingo

------------------>
Carsten Emde (1):
tracing: Fix trace_marker output

Johannes Berg (1):
tracing: Fix event format export

Roel Kluin (1):
tracing: Fix return value of tracing_stats_read()

 include/trace/ftrace.h |    2 +-
 kernel/trace/trace.c   |   41 +++++++++++++++--------------------------
 2 files changed, 16 insertions(+), 27 deletions(-)
include/trace/ftrace.h +1 -1
index cc0d966..dacb8ef 100644
@@ -159,7 +159,7 @@
 #undef __get_str
 
 #undef TP_printk
-#define TP_printk(fmt, args...) "%s, %s\n", #fmt, __stringify(args)
+#define TP_printk(fmt, args...) "\"%s\", %s\n", fmt, __stringify(args)
 
 #undef TP_fast_assign
 #define TP_fast_assign(args...) args
kernel/trace/trace.c +15 -26

85 lines not on this page · raw message