projects/linux·commit a2c348fe

[PATCH] __mod_timer: simplify ->base changing

a2c348fe · Oleg Nesterov <[email protected]> · 2006-03-31 02:30:31 -08:00

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]>
Acked-by: Ingo Molnar <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Commit
a2c348fe0117adced11e374329a5ea3f7c43cb41
Parents
3691c519

Changes

1 files changed · +6 −8

FileStatusAddDelContent
kernel/timer.cmodified+6−8View file

kernel/timer.c

View file
diff --git a/kernel/timer.c b/kernel/timer.c
index b04dc03..9062a82 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -215,21 +215,19 @@ int __mod_timer(struct timer_list *timer, unsigned long expires)
* 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;
}