diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-10-12 19:14:47 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-10-12 19:14:47 +0400 |
| commit | 910e94dd0cc5abacebf0bd5ffd859f61b9583857 (patch) | |
| tree | 7cb33f3f89f5fcdaa4dd4f5f19bb946ff495e9ac /kernel/trace/trace_irqsoff.c | |
| parent | 177e2163fe2a5951c1d0531baa4bc1f135c6b7b4 (diff) | |
| parent | d696b58ca2c3ca76e784ef89a7e0453d9b7ab187 (diff) | |
| download | linux-910e94dd0cc5abacebf0bd5ffd859f61b9583857.tar.xz | |
Merge branch 'tip/perf/core' of git://github.com/rostedt/linux into perf/core
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 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 */ |