Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier...

[linux-2.6-block.git] / kernel / timer.c

diff --git a/kernel/timer.c b/kernel/timer.c
index 54d3912f8cadd497d09546ad8b9b1ba42369634d..0b36b9e5cc8b4e27f6adf89de403885cfe8a6687 100644 (file)
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -380,6 +380,8 @@ static void timer_stats_account_timer(struct timer_list *timer)
 {
        unsigned int flag = 0;
 
+       if (likely(!timer->start_site))
+               return;
        if (unlikely(tbase_get_deferrable(timer->base)))
                flag |= TIMER_STATS_FLAG_DEFERRABLE;