Commit 2a133759 authored by Ingo Molnar's avatar 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: default avatarIngo Molnar <mingo@kernel.org>
parents 4913ae39 d41032a8
...@@ -61,7 +61,7 @@ function_trace_call(unsigned long ip, unsigned long parent_ip, ...@@ -61,7 +61,7 @@ function_trace_call(unsigned long ip, unsigned long parent_ip,
struct trace_array *tr = func_trace; struct trace_array *tr = func_trace;
struct trace_array_cpu *data; struct trace_array_cpu *data;
unsigned long flags; unsigned long flags;
unsigned int bit; int bit;
int cpu; int cpu;
int pc; int pc;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment