diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-07 13:18:59 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-07 13:18:59 +0200 |
| commit | 7a4b35082c0f6997cb32b67a9cde169ec8e64706 (patch) | |
| tree | c3fb875143d9c7862c2051bcd3447e26e354fdde /kernel/trace/trace.c | |
| parent | defa4c738aa90e29e91eff43b0c1b3198367ce9c (diff) | |
| parent | ea61623fe9badd5a195b3a0878e6d89a2f97ac0e (diff) | |
Merge branch 'cpufreq-next' of git://git.linaro.org/people/vireshk/linux into pm-cpufreq
ARM cpufreq updates from Viresh Kumar.
Diffstat (limited to 'kernel/trace/trace.c')
| -rw-r--r-- | kernel/trace/trace.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index ae6fa2d1cdf7..4d79485b3237 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -6216,10 +6216,15 @@ __init static int tracer_alloc_buffers(void) trace_init_cmdlines(); - register_tracer(&nop_trace); - + /* + * register_tracer() might reference current_trace, so it + * needs to be set before we register anything. This is + * just a bootstrap of current_trace anyway. + */ global_trace.current_trace = &nop_trace; + register_tracer(&nop_trace); + /* All seems OK, enable tracing */ tracing_disabled = 0; |