1 files changed, 4 insertions, 9 deletions

diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index 2fce056f8a49..8d7918ae4d0c 100644
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -536,6 +536,8 @@ static void enqueue_timer(struct timer_base *base, struct timer_list *timer,
         hlist_add_head(&timer->entry, base->vectors + idx);
         __set_bit(idx, base->pending_map);
         timer_set_idx(timer, idx);
+
+        trace_timer_start(timer, timer->expires, timer->flags);
 }
 
 static void
@@ -757,13 +759,6 @@ static inline void debug_init(struct timer_list *timer)
         trace_timer_init(timer);
 }
 
-static inline void
-debug_activate(struct timer_list *timer, unsigned long expires)
-{
-        debug_timer_activate(timer);
-        trace_timer_start(timer, expires, timer->flags);
-}
-
 static inline void debug_deactivate(struct timer_list *timer)
 {
         debug_timer_deactivate(timer);
@@ -1037,7 +1032,7 @@ __mod_timer(struct timer_list *timer, unsigned long expires, unsigned int option
                 }
         }
 
-        debug_activate(timer, expires);
+        debug_timer_activate(timer);
 
         timer->expires = expires;
         /*
@@ -1171,7 +1166,7 @@ void add_timer_on(struct timer_list *timer, int cpu)
         }
         forward_timer_base(base);
 
-        debug_activate(timer, timer->expires);
+        debug_timer_activate(timer);
         internal_add_timer(base, timer);
         raw_spin_unlock_irqrestore(&base->lock, flags);
 }