From a9b79c9010d2ecc187c1d3e42f764dff81bc7b96 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Fri, 11 Dec 2009 11:54:51 -0500 Subject: [PATCH] --- yaml --- r: 177351 b: refs/heads/master c: cc51a0fca66658ea710db566ba17e80e3f7d4957 h: refs/heads/master i: 177349: e91b32f248c9272e7afe64eb191f20292698b6e1 177347: 3c19d91d4bb50118f379f0bff21395c8cf60e76f 177343: 5efb123e5793fe2283f5b84421fbea3e69cba28f v: v3 --- [refs] | 2 +- trunk/kernel/trace/trace_irqsoff.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 52faba57f31d..c7457d5353b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 03889384cee7a198a79447c1ea6aca2c8e54d155 +refs/heads/master: cc51a0fca66658ea710db566ba17e80e3f7d4957 diff --git a/trunk/kernel/trace/trace_irqsoff.c b/trunk/kernel/trace/trace_irqsoff.c index 3aa7eaa2114c..2974bc7538c7 100644 --- a/trunk/kernel/trace/trace_irqsoff.c +++ b/trunk/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;