diff options
Diffstat (limited to 'kernel/trace/trace_irqsoff.c')
-rw-r--r-- | kernel/trace/trace_irqsoff.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/trace_irqsoff.c b/kernel/trace/trace_irqsoff.c index ece6cfb649fa..37ad49407f27 100644 --- a/kernel/trace/trace_irqsoff.c +++ b/kernel/trace/trace_irqsoff.c | |||
@@ -173,7 +173,7 @@ out_unlock: | |||
173 | out: | 173 | out: |
174 | data->critical_sequence = max_sequence; | 174 | data->critical_sequence = max_sequence; |
175 | data->preempt_timestamp = ftrace_now(cpu); | 175 | data->preempt_timestamp = ftrace_now(cpu); |
176 | tracing_reset(data); | 176 | tracing_reset(tr, cpu); |
177 | trace_function(tr, data, CALLER_ADDR0, parent_ip, flags); | 177 | trace_function(tr, data, CALLER_ADDR0, parent_ip, flags); |
178 | } | 178 | } |
179 | 179 | ||
@@ -203,7 +203,7 @@ start_critical_timing(unsigned long ip, unsigned long parent_ip) | |||
203 | data->critical_sequence = max_sequence; | 203 | data->critical_sequence = max_sequence; |
204 | data->preempt_timestamp = ftrace_now(cpu); | 204 | data->preempt_timestamp = ftrace_now(cpu); |
205 | data->critical_start = parent_ip ? : ip; | 205 | data->critical_start = parent_ip ? : ip; |
206 | tracing_reset(data); | 206 | tracing_reset(tr, cpu); |
207 | 207 | ||
208 | local_save_flags(flags); | 208 | local_save_flags(flags); |
209 | 209 | ||
@@ -234,7 +234,7 @@ stop_critical_timing(unsigned long ip, unsigned long parent_ip) | |||
234 | 234 | ||
235 | data = tr->data[cpu]; | 235 | data = tr->data[cpu]; |
236 | 236 | ||
237 | if (unlikely(!data) || unlikely(!head_page(data)) || | 237 | if (unlikely(!data) || |
238 | !data->critical_start || atomic_read(&data->disabled)) | 238 | !data->critical_start || atomic_read(&data->disabled)) |
239 | return; | 239 | return; |
240 | 240 | ||