|
@@ -1007,8 +1007,6 @@ __mod_timer(struct timer_list *timer, unsigned long expires, unsigned int option
|
|
|
if (!ret && (options & MOD_TIMER_PENDING_ONLY))
|
|
|
goto out_unlock;
|
|
|
|
|
|
- debug_activate(timer, expires);
|
|
|
-
|
|
|
new_base = get_target_base(base, timer->flags);
|
|
|
|
|
|
if (base != new_base) {
|
|
@@ -1032,6 +1030,8 @@ __mod_timer(struct timer_list *timer, unsigned long expires, unsigned int option
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ debug_activate(timer, expires);
|
|
|
+
|
|
|
timer->expires = expires;
|
|
|
/*
|
|
|
* If 'idx' was calculated above and the base time did not advance
|