Commit 2a133759 authored Jan 24, 2013 by Ingo Molnar

Merge branch 'tip/perf/core' of...

Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

 into perf/core

Pull small function-tracing smatch fixlet from Steve Rostedt.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

parents 4913ae39 d41032a8

kernel/trace/trace_functions.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -61,7 +61,7 @@ function_trace_call(unsigned long ip, unsigned long parent_ip,
		struct trace_array *tr = func_trace;
		struct trace_array_cpu *data;
		unsigned long flags;
		unsigned int bit;
		int bit;
		int cpu;
		int pc;