From 1c6ebe951407d1a6f60ce8c69f5df3b548248b87 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Thu, 11 Mar 2010 14:04:30 -0800 Subject: [PATCH] --- yaml --- r: 189094 b: refs/heads/master c: 829b6c1ef488856c6a46a2f705f5068062d5f34c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/timer.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5b4c37accb42..8c15fcf44861 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 80a05b9ffa7dc13f6693902dd8999a2b61a3a0d7 +refs/heads/master: 829b6c1ef488856c6a46a2f705f5068062d5f34c diff --git a/trunk/kernel/timer.c b/trunk/kernel/timer.c index c61a7949387f..fc965eae0e87 100644 --- a/trunk/kernel/timer.c +++ b/trunk/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);