* Tom Zanussi <tzanussi@gmail.com> wrote:

> This patch changes filter_check_discard() to make use of the new 
> ring_buffer_discard_commit() function and modifies the current 
> users to call the old commit function in the non-discard case.  It 
> also introduces a version of filter_check_discard() that uses the 
> global trace buffer (filter_current_check_discard()) for those 
> cases.

Nice!

I've merged it into tip/tracing/filters but it cannot go into 
tip/master yet due to build failures. I fixed the obvious typo 
problem (find the fix below) but punted on this one for now:

 kernel/built-in.o: In function `filter_check_discard':
 trace.c:(.text+0x613fc): undefined reference to  `filter_match_preds'
 kernel/built-in.o: In function `trace_vprintk':
 (.text+0x6154f): undefined reference to `event_print'
 kernel/built-in.o: In function `trace_vbprintk':
 (.text+0x61717): undefined reference to `event_bprint'
 kernel/built-in.o: In function `__ftrace_trace_stack':

config attached.

	Ingo

Index: linux/kernel/trace/trace_branch.c
===================================================================
--- linux.orig/kernel/trace/trace_branch.c
+++ linux/kernel/trace/trace_branch.c
@@ -74,7 +74,7 @@ probe_likely_condition(struct ftrace_bra
 	entry->line = f->line;
 	entry->correct = val == expect;
 
-	if !(filter_check_discard(call, entry, event))
+	if (!(filter_check_discard(call, entry, tr->buffer, event)))
 		ring_buffer_unlock_commit(tr->buffer, event);
 
  out: