From: Andrew Morton <akpm@linux-foundation.org>
Date: Thu, 11 Mar 2010 22:04:30 +0000 (-0800)
Subject: timer stats: Fix del_timer_sync() and try_to_del_timer_sync()
X-Git-Tag: upstream/snapshot3+hdmi~14956^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=829b6c1ef488856c6a46a2f705f5068062d5f34c;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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>
---

diff --git a/kernel/timer.c b/kernel/timer.c
index c61a794..fc965ea 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);