2006-03-25 23:48:09

by Oleg Nesterov

Subject: [PATCH 2.6.16-mm1] __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]>

--- MM/kernel/timer.c~ 2006-03-25 18:44:18.000000000 +0300
+++ MM/kernel/timer.c 2006-03-25 18:50:07.000000000 +0300
@@ -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;
}

2006-03-26 16:44:31

by Ingo Molnar

Subject: Re: [PATCH 2.6.16-mm1] __mod_timer: simplify ->base changing

* Oleg Nesterov <[email protected]> wrote:

> 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]>

nice!

Acked-by: Ingo Molnar <[email protected]>

Ingo