aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorMathieu Desnoyers <mathieu.desnoyers@efficios.com>2011-03-16 19:05:56 -0400
committerMathieu Desnoyers <mathieu.desnoyers@polymtl.ca>2011-03-16 19:05:56 -0400
commit3181ff37cc46f72c01421e1c85965dcf10df8130 (patch)
tree5e98dcbdb026c00190f756e8cae2aca33ea88539 /kernel
parent99bc73f616db2e87f0e1918aad59eb68ee1ff573 (diff)
downloadlinux-linaro-android-3181ff37cc46f72c01421e1c85965dcf10df8130.tar.gz
lttng-instrumentation-xtime-deprecated
lttng instrumentation xtime deprecated Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/timer.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/kernel/timer.c b/kernel/timer.c
index d58739a48ae..65cc58ce148 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -1310,9 +1310,13 @@ void run_local_timers(void)
void do_timer(unsigned long ticks)
{
+ struct timespec curtime, wtom;
+
jiffies_64 += ticks;
update_wall_time();
- trace_timer_update_time(&xtime, &wall_to_monotonic);
+ curtime = __current_kernel_time();
+ wtom = __get_wall_to_monotonic();
+ trace_timer_update_time(&curtime, &wtom);
calc_global_load(ticks);
}