aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace.c
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2008-05-12 21:20:48 +0200
committerThomas Gleixner <tglx@linutronix.de>2008-05-23 20:54:26 +0200
commit26994ead1fc8cced63f17e9848edc1771036664e (patch)
treebb89509f50cab3e534ea3bc7b9e163688641cb4b /kernel/trace/trace.c
parentftrace: disable tracing on failure (diff)
downloadlinux-dev-26994ead1fc8cced63f17e9848edc1771036664e.tar.xz
linux-dev-26994ead1fc8cced63f17e9848edc1771036664e.zip
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;
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);