Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2c348fe authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds
Browse files

[PATCH] __mod_timer: simplify ->base changing 



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: default avatarOleg Nesterov <oleg@tv-sign.ru>
Acked-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 3691c519

kernel/timer.c

+6 −8
Original line number Diff line number Diff line
@@ -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;

}