diff options
| author | Gary S. Robertson <gary.robertson@linaro.org> | 2013-09-10 13:37:29 -0500 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2013-09-10 13:37:29 -0500 |
| commit | 851a49d5d93bb534400c9aa81ec88057834b1b86 (patch) | |
| tree | ff1a0ae4d127a037f55b8171e1f9510846c46d7f /kernel/trace/trace_irqsoff.c | |
| parent | 726a88c237f0fd8510e208ea367c614e48d1fa39 (diff) | |
| parent | 0a4b6d4ff200a553951f77f765971cb3e4c91ec0 (diff) | |
Merge tag 'v3.10.9' into linux-lng - update linux-lng to v3.10.9linux-lng-3.10.9
This is the 3.10.9 stable release
Diffstat (limited to 'kernel/trace/trace_irqsoff.c')
| -rw-r--r-- | kernel/trace/trace_irqsoff.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/trace_irqsoff.c b/kernel/trace/trace_irqsoff.c index b19d065a28cb..2aefbee93a6d 100644 --- a/kernel/trace/trace_irqsoff.c +++ b/kernel/trace/trace_irqsoff.c @@ -373,7 +373,7 @@ start_critical_timing(unsigned long ip, unsigned long parent_ip) struct trace_array_cpu *data; unsigned long flags; - if (likely(!tracer_enabled)) + if (!tracer_enabled || !tracing_is_enabled()) return; cpu = raw_smp_processor_id(); @@ -416,7 +416,7 @@ stop_critical_timing(unsigned long ip, unsigned long parent_ip) else return; - if (!tracer_enabled) + if (!tracer_enabled || !tracing_is_enabled()) return; data = per_cpu_ptr(tr->trace_buffer.data, cpu); |