diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2008-05-12 21:20:46 +0200 |
|---|---|---|
| committer |   Thomas Gleixner <tglx@linutronix.de> | 2008-05-23 20:42:31 +0200 |
| commit | 750ed1a40783432d0dcb0e6c2e813a12615d7664 (patch) | |
| tree | dc2d0eae703ec2ad3fe9a5bc657da5dbe0af2385 /kernel/trace/trace_irqsoff.c | |
| parent | ftrace: cleanups (diff) | |
| download | linux-dev-750ed1a40783432d0dcb0e6c2e813a12615d7664.tar.xz linux-dev-750ed1a40783432d0dcb0e6c2e813a12615d7664.zip | |
ftrace: timestamp syncing, prepare
rename and uninline now() to ftrace_now().
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
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 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, * as long as possible: */ T0 = data->preempt_timestamp; - T1 = now(cpu); + T1 = ftrace_now(cpu); delta = T1-T0; local_save_flags(flags); @@ -186,7 +186,7 @@ out_unlock: out: data->critical_sequence = max_sequence; - data->preempt_timestamp = now(cpu); + data->preempt_timestamp = ftrace_now(cpu); tracing_reset(data); ftrace(tr, data, CALLER_ADDR0, parent_ip, flags); } @@ -215,7 +215,7 @@ start_critical_timing(unsigned long ip, unsigned long parent_ip) atomic_inc(&data->disabled); data->critical_sequence = max_sequence; - data->preempt_timestamp = now(cpu); + data->preempt_timestamp = ftrace_now(cpu); data->critical_start = parent_ip ? : ip; tracing_reset(data); |