sched: fix mysql+oltp regression

[linux-2.6-omap-h63xx.git] / kernel / trace / trace_functions.c

diff --git a/kernel/trace/trace_functions.c b/kernel/trace/trace_functions.c
index 69a0eb00a0a519b0b978b3cebab8adb2ade6c8be..312144897970b18c7d9fd596bbf033182f68822b 100644 (file)
--- a/kernel/trace/trace_functions.c
+++ b/kernel/trace/trace_functions.c
@@ -16,7 +16,7 @@
 
 #include "trace.h"
 
-static notrace void function_reset(struct trace_array *tr)
+static void function_reset(struct trace_array *tr)
 {
        int cpu;
 
@@ -26,30 +26,35 @@ static notrace void function_reset(struct trace_array *tr)
                tracing_reset(tr->data[cpu]);
 }
 
-static notrace void start_function_trace(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();
 }
 
-static notrace void stop_function_trace(struct trace_array *tr)
+static void stop_function_trace(struct trace_array *tr)
 {
        tracing_stop_function_trace();
+       tracing_stop_cmdline_record();
 }
 
-static notrace void function_trace_init(struct trace_array *tr)
+static void function_trace_init(struct trace_array *tr)
 {
        if (tr->ctrl)
                start_function_trace(tr);
 }
 
-static notrace void function_trace_reset(struct trace_array *tr)
+static void function_trace_reset(struct trace_array *tr)
 {
        if (tr->ctrl)
                stop_function_trace(tr);
 }
 
-static notrace void function_trace_ctrl_update(struct trace_array *tr)
+static void function_trace_ctrl_update(struct trace_array *tr)
 {
        if (tr->ctrl)
                start_function_trace(tr);