Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6

[linux-2.6-block.git] / kernel / timer.c

diff --git a/kernel/timer.c b/kernel/timer.c
index c61a7949387f93e69b1a4979eff1a03c7e7131b4..fc965eae0e87bf43a238d5c018f12726feb2dc4d 100644 (file)
--- 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);