diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-06 00:22:26 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-06 00:22:26 +0100 |
| commit | 28b4d5cc17c20786848cdc07b7ea237a309776bb (patch) | |
| tree | bae406a4b17229dcce7c11be5073f7a67665e477 /include/trace/ftrace.h | |
| parent | mac80211: fix reorder buffer release (diff) | |
| parent | Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| download | linux-28b4d5cc17c20786848cdc07b7ea237a309776bb.tar.xz linux-28b4d5cc17c20786848cdc07b7ea237a309776bb.zip | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/net/pcmcia/fmvj18x_cs.c
drivers/net/pcmcia/nmclan_cs.c
drivers/net/pcmcia/xirc2ps_cs.c
drivers/net/wireless/ray_cs.c
Diffstat (limited to 'include/trace/ftrace.h')
| -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 @@ #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 |