tracing fixes
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
Thanks,
Ingo
------------------>
Li Zefan (1):
tracing/filters: Fix memory leak when setting a filter
Steven Rostedt (1):
tracing: fix trace_vprintk call
kernel/trace/trace.c | 2 +- kernel/trace/trace_events_filter.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
kernel/trace/trace.c +1 -1
@@ -1393,7 +1393,7 @@ int trace_array_vprintk(struct trace_array *tr,int trace_vprintk (unsigned long ip,const char *fmt,va_list args) { -return trace_array_printk (&global_trace, ip, fmt, args); +return trace_array_vprintk (&global_trace, ip, fmt, args); }EXPORT_SYMBOL_GPL (trace_vprintk);
kernel/trace/trace_events_filter.c +2 -1
@@ -933,8 +933,9 @@ static void postfix_clear(struct filter_parse_state *ps)while (!list_empty (&ps->postfix)) { elt = list_first_entry(&ps->postfix, struct postfix_elt, list); -kfree (elt->operand);list_del (&elt->list); +kfree (elt->operand); +kfree (elt); } }