aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace.c
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2008-05-12 15:20:48 -0400
committerThomas Gleixner <tglx@linutronix.de>2008-05-23 14:54:26 -0400
commit26994ead1fc8cced63f17e9848edc1771036664e (patch)
treebb89509f50cab3e534ea3bc7b9e163688641cb4b /kernel/trace/trace.c
parent4eebcc81a33fbc45e28542b50197ed7b3c486d90 (diff)
ftrace: enabled tracing by default
This patch is the correct way to have tracing enabled by default. Signed-off-by: Steven Rostedt <srostedt@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/trace/trace.c')
-rw-r--r--kernel/trace/trace.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index c56fc5e60133..3dc6eac85b11 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -107,7 +107,7 @@ static struct trace_array max_tr;
107 107
108static DEFINE_PER_CPU(struct trace_array_cpu, max_data); 108static DEFINE_PER_CPU(struct trace_array_cpu, max_data);
109 109
110static int tracer_enabled; 110static int tracer_enabled = 1;
111static unsigned long trace_nr_entries = 16384UL; 111static unsigned long trace_nr_entries = 16384UL;
112 112
113static struct tracer *trace_types __read_mostly; 113static struct tracer *trace_types __read_mostly;
@@ -2268,6 +2268,8 @@ __init static int tracer_alloc_buffers(void)
2268 int ret = -ENOMEM; 2268 int ret = -ENOMEM;
2269 int i; 2269 int i;
2270 2270
2271 global_trace.ctrl = tracer_enabled;
2272
2271 /* Allocate the first page for all buffers */ 2273 /* Allocate the first page for all buffers */
2272 for_each_possible_cpu(i) { 2274 for_each_possible_cpu(i) {
2273 data = global_trace.data[i] = &per_cpu(global_trace_cpu, i); 2275 data = global_trace.data[i] = &per_cpu(global_trace_cpu, i);