Merge branch 'linus' into timers/core

[~andy/linux] / kernel / timer.c

diff --git a/kernel/timer.c b/kernel/timer.c
index 49773f38c9bc0d2d7a743756d88f90fd8695dd2f..9199f3c5221526a1f7f60e52a33f7a6554cc0adf 100644 (file)
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -39,6 +39,7 @@
 #include <linux/kallsyms.h>
 #include <linux/perf_event.h>
 #include <linux/sched.h>
+#include <linux/slab.h>
 
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
@@ -936,6 +937,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);