diff options
| author | Ingo Molnar | 2013-01-24 14:31:26 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2013-01-24 14:31:53 +0100 |
| commit | 2a1337599b0b5629d3ff163f803659f658bb4a14 (patch) | |
| tree | b4d8c3e3eec91e33caafbfaca77f8c0e702a1f62 /kernel | |
| parent | 4913ae3991acf00b414701852ee2193d1edd9c2d (diff) | |
| parent | d41032a83b4683481cadff84bbf8e0eafeaba830 (diff) | |
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>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/trace_functions.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_functions.c b/kernel/trace/trace_functions.c index 1c327ef13a9a..601152523326 100644 --- 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; |