1 files changed, 18 insertions, 14 deletions

diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index 2fce056f8a49..343c7ba33b1c 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);
 }
@@ -1298,7 +1293,9 @@ int del_timer_sync(struct timer_list *timer)
 EXPORT_SYMBOL(del_timer_sync);
 #endif
 
-static void call_timer_fn(struct timer_list *timer, void (*fn)(struct timer_list *))
+static void call_timer_fn(struct timer_list *timer,
+                          void (*fn)(struct timer_list *),
+                          unsigned long baseclk)
 {
         int count = preempt_count();
 
@@ -1321,14 +1318,14 @@ static void call_timer_fn(struct timer_list *timer, void (*fn)(struct timer_list
          */
         lock_map_acquire(&lockdep_map);
 
-        trace_timer_expire_entry(timer);
+        trace_timer_expire_entry(timer, baseclk);
         fn(timer);
         trace_timer_expire_exit(timer);
 
         lock_map_release(&lockdep_map);
 
         if (count != preempt_count()) {
-                WARN_ONCE(1, "timer: %pF preempt leak: %08x -> %08x\n",
+                WARN_ONCE(1, "timer: %pS preempt leak: %08x -> %08x\n",
                           fn, count, preempt_count());
                 /*
                  * Restore the preempt count. That gives us a decent
@@ -1342,6 +1339,13 @@ static void call_timer_fn(struct timer_list *timer, void (*fn)(struct timer_list
 
 static void expire_timers(struct timer_base *base, struct hlist_head *head)
 {
+        /*
+         * This value is required only for tracing. base->clk was
+         * incremented directly before expire_timers was called. But expiry
+         * is related to the old base->clk value.
+         */
+        unsigned long baseclk = base->clk - 1;
+
         while (!hlist_empty(head)) {
                 struct timer_list *timer;
                 void (*fn)(struct timer_list *);
@@ -1355,11 +1359,11 @@ static void expire_timers(struct timer_base *base, struct hlist_head *head)
 
                 if (timer->flags & TIMER_IRQSAFE) {
                         raw_spin_unlock(&base->lock);
-                        call_timer_fn(timer, fn);
+                        call_timer_fn(timer, fn, baseclk);
                         raw_spin_lock(&base->lock);
                 } else {
                         raw_spin_unlock_irq(&base->lock);
-                        call_timer_fn(timer, fn);
+                        call_timer_fn(timer, fn, baseclk);
                         raw_spin_lock_irq(&base->lock);
                 }
         }