diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2011-09-22 11:11:51 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2011-09-22 11:11:51 -0400 |
| commit | e36de1de4a5f95b7cb3e5c37d10e6bbb91833ef0 (patch) | |
| tree | 69eab1dc497ec8cb25dfbe6bd98da7656a50c878 /kernel/trace | |
| parent | 6249687f76b69cc0b2ad34636f4a18d693ef3262 (diff) | |
| download | linux-stable-e36de1de4a5f95b7cb3e5c37d10e6bbb91833ef0.tar.gz linux-stable-e36de1de4a5f95b7cb3e5c37d10e6bbb91833ef0.tar.bz2 linux-stable-e36de1de4a5f95b7cb3e5c37d10e6bbb91833ef0.zip | |
tracing: Fix preemptirqsoff tracer to not stop at preempt off
If irqs are disabled when preemption count reaches zero, the
preemptirqsoff tracer should not flag that as the end.
When interrupts are enabled and preemption count is not zero
the preemptirqsoff correctly continues its tracing.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace')
| -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 667aa8cc0cfc..a1a3359996a7 100644 --- a/kernel/trace/trace_irqsoff.c +++ b/kernel/trace/trace_irqsoff.c @@ -505,13 +505,13 @@ EXPORT_SYMBOL(trace_hardirqs_off_caller); #ifdef CONFIG_PREEMPT_TRACER void trace_preempt_on(unsigned long a0, unsigned long a1) { - if (preempt_trace()) + if (preempt_trace() && !irq_trace()) stop_critical_timing(a0, a1); } void trace_preempt_off(unsigned long a0, unsigned long a1) { - if (preempt_trace()) + if (preempt_trace() && !irq_trace()) start_critical_timing(a0, a1); } #endif /* CONFIG_PREEMPT_TRACER */ |