---

yaml --- r: 100463 b: refs/heads/master c: 26994ea h: refs/heads/master i: 100461: 8edf250 100459: 66168da 100455: 2408449 100447: 961a143 v: v3
git-mirror · May 23, 2008 · 373352e · 373352e
1 parent 6baff18
commit 373352e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4eebcc81a33fbc45e28542b50197ed7b3c486d90
+refs/heads/master: 26994ead1fc8cced63f17e9848edc1771036664e
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
@@ -107,7 +107,7 @@ static struct trace_array	max_tr;
 
 static DEFINE_PER_CPU(struct trace_array_cpu, max_data);
 
-static int			tracer_enabled;
+static int			tracer_enabled = 1;
 static unsigned long		trace_nr_entries = 16384UL;
 
 static struct tracer		*trace_types __read_mostly;
@@ -2268,6 +2268,8 @@ __init static int tracer_alloc_buffers(void)
 	int ret = -ENOMEM;
 	int i;
 
+	global_trace.ctrl = tracer_enabled;
+
 	/* Allocate the first page for all buffers */
 	for_each_possible_cpu(i) {
 		data = global_trace.data[i] = &per_cpu(global_trace_cpu, i);