diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-14 15:58:35 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-14 15:58:35 +0200 |
| commit | 6712e299b7dc78aa4971b85e803435ee6d49a9dd (patch) | |
| tree | b3d17a2d068737ec07727b28e93c7d374c27721b /kernel/trace/trace_functions.c | |
| parent | ec1bb60bbff0386c3ec25360e7a8c72f467a6ff1 (diff) | |
| parent | b2613e370dbeb69edbff989382fa54f2395aa471 (diff) | |
Merge branch 'tracing/ftrace' into auto-ftrace-next
Diffstat (limited to 'kernel/trace/trace_functions.c')
| -rw-r--r-- | kernel/trace/trace_functions.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/trace/trace_functions.c b/kernel/trace/trace_functions.c index 7ee7dcd76b7..31214489797 100644 --- a/kernel/trace/trace_functions.c +++ b/kernel/trace/trace_functions.c @@ -28,7 +28,10 @@ static void function_reset(struct trace_array *tr) static void start_function_trace(struct trace_array *tr) { + tr->cpu = get_cpu(); function_reset(tr); + put_cpu(); + tracing_start_cmdline_record(); tracing_start_function_trace(); } |