summaryrefslogtreecommitdiffstats
path: root/kernel/timer.c
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2010-03-11 23:04:30 +0100
committerThomas Gleixner <tglx@linutronix.de>2010-03-12 19:11:29 +0100
commit829b6c1ef488856c6a46a2f705f5068062d5f34c (patch)
tree9433440d8afc11b023231e185ff05db9c9e12ea4 /kernel/timer.c
parentclockevents: Sanitize min_delta_ns adjustment and prevent overflows (diff)
downloadlinux-829b6c1ef488856c6a46a2f705f5068062d5f34c.tar.xz
linux-829b6c1ef488856c6a46a2f705f5068062d5f34c.zip
timer stats: Fix del_timer_sync() and try_to_del_timer_sync()
These functions forgot to run timer_stats_timer_clear_start_info(). It's unobvious what effect this has and whether it matters much - we won't be printing it out anyway if the timer's detached. Untested, just an Ingo trollpatch. [ Nevertheless correct - tglx ] Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Cc: Ingo Molnar <mingo@elte.hu> Cc: johnstul@us.ibm.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/timer.c')
-rw-r--r--kernel/timer.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/timer.c b/kernel/timer.c
index c61a7949387f..fc965eae0e87 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -880,6 +880,7 @@ int try_to_del_timer_sync(struct timer_list *timer)
if (base->running_timer == timer)
goto out;
+ timer_stats_timer_clear_start_info(timer);
ret = 0;
if (timer_pending(timer)) {
detach_timer(timer, 1);