diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-12-14 17:12:37 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-12-14 17:12:37 +0100 |
| commit | 0087aabd6a3744c28114240776918f5d15e46b98 (patch) | |
| tree | 8bf3ba7b3395490441722360d2872480f64cd694 /kernel/trace/trace_irqsoff.c | |
| parent | cc0104e877fff32865a67b256d3a9ce52ff15790 (diff) | |
| parent | cc51a0fca66658ea710db566ba17e80e3f7d4957 (diff) | |
| download | blackbird-op-linux-0087aabd6a3744c28114240776918f5d15e46b98.tar.gz blackbird-op-linux-0087aabd6a3744c28114240776918f5d15e46b98.zip | |
Merge branch 'tip/tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent
Diffstat (limited to 'kernel/trace/trace_irqsoff.c')
| -rw-r--r-- | kernel/trace/trace_irqsoff.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/trace/trace_irqsoff.c b/kernel/trace/trace_irqsoff.c index 3aa7eaa2114c..2974bc7538c7 100644 --- a/kernel/trace/trace_irqsoff.c +++ b/kernel/trace/trace_irqsoff.c @@ -151,6 +151,8 @@ check_critical_timing(struct trace_array *tr, goto out_unlock; trace_function(tr, CALLER_ADDR0, parent_ip, flags, pc); + /* Skip 5 functions to get to the irq/preempt enable function */ + __trace_stack(tr, flags, 5, pc); if (data->critical_sequence != max_sequence) goto out_unlock; |
