* Steven Rostedt <rostedt@xxxxxxxxxxx> wrote: > On Sat, 2009-11-14 at 10:18 +0000, tip-bot for Johannes Berg wrote: > > Commit-ID: 811cb50baf63461ce0bdb234927046131fc7fa8b > > Gitweb: http://git.kernel.org/tip/811cb50baf63461ce0bdb234927046131fc7fa8b > > Author: Johannes Berg <johannes@xxxxxxxxxxxxxxxx> > > AuthorDate: Fri, 13 Nov 2009 23:40:09 +0100 > > Committer: Steven Rostedt <rostedt@xxxxxxxxxxx> > > CommitDate: Fri, 13 Nov 2009 22:20:34 -0500 > > > > tracing: Fix event format export > > > > For some reason the export of the event print format to userspace > > uses '#fmt' which breaks if the format string is anything but a plain > > string, for example if it is built with macros then the macro names > > are exported instead of their contents. > > > > Use > > "\"%s\"", fmt > > instead of > > "%s", #fmt > > to export the string and not the way it is built. > > > > For example, in net/mac80211/driver-trace.h for the trace event drv_start > > there is: > > > > TP_printk( > > LOCAL_PR_FMT, LOCAL_PR_ARG > > ) > > > > Which use to produce: > > > > print fmt: LOCAL_PR_FMT, REC->wiphy_name > > > > Now produces: > > > > print fmt: "%s", REC->wiphy_name > > > > Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx> > > LKML-Reference: <20091113224009.GB23942@xxxxxxx> > > Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx> > > > Ingo, > > Any reason that this did not make it into Mainline? 2.6.32 is out, and > Johannes Berg was depending on this for his users. Yeah, it narrowly missed the last -rc (-rc8), and we only push post-final-rc fixes for serious show-stopper regressions. v2.6.32.1 will have this (and other) fixes. Johannes can cherry-pick the fix in a day or so once it hits Linus's tree in the merge window. Thanks, Ingo -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html