__mod_timer: simplify ->base changing
PATCH 1/1 __mod_timer: simplify ->base changing
On top of
kill-__init_timer_base-in-favor-of-boot_tvec_bases.patch
Since base and new_base are of the same type now, we can save one 'if' branch and simplify the code a bit.
Signed-off-by Oleg Nesterov <[email protected]>
kernel/timer.c renamed from kernel/timer.c~ +6 -8
@@ -215,21 +215,19 @@ int __mod_timer(struct timer_list *timer* handler yet has not finished. This also guarantees that * the timer is serialized wrt itself. */ -if (unlikely (base->running_timer == timer)) { -/* The timer remains on a former base */ - new_base = base; - }else { +if (likely (base->running_timer != timer)) {/* See the comment in lock_timer_base() */ timer->base =NULL ;spin_unlock (&base->lock); -spin_lock (&new_base->lock); - timer->base = new_base; + base = new_base; +spin_lock (&base->lock); + timer->base = base; } } timer->expires = expires; -internal_add_timer (new_base, timer); -spin_unlock_irqrestore (&new_base->lock, flags); +internal_add_timer (base, timer); +spin_unlock_irqrestore (&base->lock, flags);return ret; }
Quoted 7 lines · Oleg Nesterov
On top of
kill-__init_timer_base-in-favor-of-boot_tvec_bases.patchSince base and
new_baseare of the same type now, we can save one 'if' branch and simplify the code a bit.Signed-off-by Oleg Nesterov <[email protected]>
nice!
Acked-by Ingo Molnar <[email protected]>
Ingo