diff options
Diffstat (limited to 'kernel/trace')
-rw-r--r-- | kernel/trace/trace.c | 4 |
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 | ||
108 | static DEFINE_PER_CPU(struct trace_array_cpu, max_data); | 108 | static DEFINE_PER_CPU(struct trace_array_cpu, max_data); |
109 | 109 | ||
110 | static int tracer_enabled; | 110 | static int tracer_enabled = 1; |
111 | static unsigned long trace_nr_entries = 16384UL; | 111 | static unsigned long trace_nr_entries = 16384UL; |
112 | 112 | ||
113 | static struct tracer *trace_types __read_mostly; | 113 | static 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); |