Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e345fe1a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'tracing-fixes-for-linus' of... 

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/filters: Fix memory leak when setting a filter
  tracing: fix trace_vprintk call
parents ea876441 8ad80731

kernel/trace/trace.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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);

	}

}