luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] __mod_timer: simplify ->base changing

Browse Source 
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 <oleg@tv-sign.ru>
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Oleg Nesterov 2006-03-31 02:30:31 -08:00 committed by Linus Torvalds
parent 3691c5199e
commit a2c348fe01
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kernel/timer.c
View File

@ -215,21 +215,19 @@ int __mod_timer(struct timer_list *timer, unsigned long expires)
* handler yet has not finished. This also guarantees that * handler yet has not finished. This also guarantees that
* the timer is serialized wrt itself. * the timer is serialized wrt itself.
*/ */
if (unlikely(base->running_timer == timer)) { if (likely(base->running_timer != timer)) {
/* The timer remains on a former base */
new_base = base;
} else {
/* See the comment in lock_timer_base() */ /* See the comment in lock_timer_base() */
timer->base = NULL; timer->base = NULL;
spin_unlock(&base->lock); spin_unlock(&base->lock);
spin_lock(&new_base->lock); base = new_base;
timer->base = new_base; spin_lock(&base->lock);
timer->base = base;
} }
} }
timer->expires = expires; timer->expires = expires;
internal_add_timer(new_base, timer); internal_add_timer(base, timer);
spin_unlock_irqrestore(&new_base->lock, flags); spin_unlock_irqrestore(&base->lock, flags);
return ret; return ret;
} }