aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace_irqsoff.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/trace/trace_irqsoff.c')
-rw-r--r--kernel/trace/trace_irqsoff.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/trace_irqsoff.c b/kernel/trace/trace_irqsoff.c
index 2dfebb67fdfb..d2a6e6f1ad2d 100644
--- a/kernel/trace/trace_irqsoff.c
+++ b/kernel/trace/trace_irqsoff.c
@@ -136,7 +136,7 @@ check_critical_timing(struct trace_array *tr,
136 * as long as possible: 136 * as long as possible:
137 */ 137 */
138 T0 = data->preempt_timestamp; 138 T0 = data->preempt_timestamp;
139 T1 = now(cpu); 139 T1 = ftrace_now(cpu);
140 delta = T1-T0; 140 delta = T1-T0;
141 141
142 local_save_flags(flags); 142 local_save_flags(flags);
@@ -186,7 +186,7 @@ out_unlock:
186 186
187out: 187out:
188 data->critical_sequence = max_sequence; 188 data->critical_sequence = max_sequence;
189 data->preempt_timestamp = now(cpu); 189 data->preempt_timestamp = ftrace_now(cpu);
190 tracing_reset(data); 190 tracing_reset(data);
191 ftrace(tr, data, CALLER_ADDR0, parent_ip, flags); 191 ftrace(tr, data, CALLER_ADDR0, parent_ip, flags);
192} 192}
@@ -215,7 +215,7 @@ start_critical_timing(unsigned long ip, unsigned long parent_ip)
215 atomic_inc(&data->disabled); 215 atomic_inc(&data->disabled);
216 216
217 data->critical_sequence = max_sequence; 217 data->critical_sequence = max_sequence;
218 data->preempt_timestamp = now(cpu); 218 data->preempt_timestamp = ftrace_now(cpu);
219 data->critical_start = parent_ip ? : ip; 219 data->critical_start = parent_ip ? : ip;
220 tracing_reset(data); 220 tracing_reset(data);
221 221