aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/time/timer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index 6be576e02209..89a9e1b4264a 100644
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -1007,8 +1007,6 @@ __mod_timer(struct timer_list *timer, unsigned long expires, unsigned int option
1007 if (!ret && (options & MOD_TIMER_PENDING_ONLY)) 1007 if (!ret && (options & MOD_TIMER_PENDING_ONLY))
1008 goto out_unlock; 1008 goto out_unlock;
1009 1009
1010 debug_activate(timer, expires);
1011
1012 new_base = get_target_base(base, timer->flags); 1010 new_base = get_target_base(base, timer->flags);
1013 1011
1014 if (base != new_base) { 1012 if (base != new_base) {
@@ -1032,6 +1030,8 @@ __mod_timer(struct timer_list *timer, unsigned long expires, unsigned int option
1032 } 1030 }
1033 } 1031 }
1034 1032
1033 debug_activate(timer, expires);
1034
1035 timer->expires = expires; 1035 timer->expires = expires;
1036 /* 1036 /*
1037 * If 'idx' was calculated above and the base time did not advance 1037 * If 'idx' was calculated above and the base time did not advance