Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/ke…

…rnel/git/rostedt/linux-trace into perf/core Pull small function-tracing smatch fixlet from Steve Rostedt. Signed-off-by: Ingo Molnar <mingo@kernel.org>
mariux64 · Jan 24, 2013 · 2a13375 · 2a13375
2 parents 4913ae3 + d41032a
commit 2a13375
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/kernel/trace/trace_functions.c b/kernel/trace/trace_functions.c
@@ -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;