diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-03 18:49:14 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-03 18:49:14 -0400 |
| commit | 87e8b821ed8db3dab03d96cd542e29666bf210aa (patch) | |
| tree | 0027060473aafbbb125655ba027319c8a1a665fc /kernel/timer.c | |
| parent | 33cd9dfa3a13e3d8e41aef225a9f98169816723b (diff) | |
| parent | 5e11611a5d22252f3f9c169a3c9377eac0c32033 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
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) | |||
| 880 | if (base->running_timer == timer) | 880 | if (base->running_timer == timer) |
| 881 | goto out; | 881 | goto out; |
| 882 | 882 | ||
| 883 | timer_stats_timer_clear_start_info(timer); | ||
| 883 | ret = 0; | 884 | ret = 0; |
| 884 | if (timer_pending(timer)) { | 885 | if (timer_pending(timer)) { |
| 885 | detach_timer(timer, 1); | 886 | detach_timer(timer, 1); |