diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-04-21 15:26:56 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-04-21 15:26:56 -0700 |
| commit | e2bca7c76a79b68506bfc3699beb74c0d41fe230 (patch) | |
| tree | 1b0269083de5ccc61a96b615ef271098df8e1b6a /kernel/timer.c | |
| parent | b3c7740a120c8a7775cb63b4d094466da5c01692 (diff) | |
| parent | d54a45e2533ef33678dc340298b022a289d2b3e3 (diff) | |
Merge branch 'for_2.6.34rc_a' of git://git.pwsan.com/linux-2.6 into omap-fixes-for-linus
Diffstat (limited to 'kernel/timer.c')
| -rw-r--r-- | kernel/timer.c | 1 |
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); |