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

Commit facbb4a7 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

timers: Consolidate base->next_timer update 



Another bunch of mindlessly copied code. All callers of
internal_add_timer() except the recascading code updates
base->next_timer.

Move this into internal_add_timer() and let the cascading code call
__internal_add_timer().

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Gilad Ben-Yossef <gilad@benyossef.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Link: http://lkml.kernel.org/r/20120525214819.189946224@linutronix.de
parent ec44bc7a

kernel/timer.c

+15 −11
Original line number Diff line number Diff line
@@ -330,7 +330,8 @@ void set_timer_slack(struct timer_list *timer, int slack_hz) 
}

EXPORT_SYMBOL_GPL(set_timer_slack);



static void internal_add_timer(struct tvec_base *base, struct timer_list *timer)

static void

__internal_add_timer(struct tvec_base *base, struct timer_list *timer)

{

	unsigned long expires = timer->expires;

	unsigned long idx = expires - base->timer_jiffies;
@@ -372,6 +373,17 @@ static void internal_add_timer(struct tvec_base *base, struct timer_list *timer) 
	list_add_tail(&timer->entry, vec);

}



static void internal_add_timer(struct tvec_base *base, struct timer_list *timer)

{

	__internal_add_timer(base, timer);

	/*

	 * Update base->next_timer if this is the earliest one.

	 */

	if (time_before(timer->expires, base->next_timer) &&

	    !tbase_get_deferrable(timer->base))

		base->next_timer = timer->expires;

}



#ifdef CONFIG_TIMER_STATS

void __timer_stats_timer_set_start_info(struct timer_list *timer, void *addr)

{
@@ -757,9 +769,6 @@ __mod_timer(struct timer_list *timer, unsigned long expires, 
	}



	timer->expires = expires;

	if (time_before(timer->expires, base->next_timer) &&

	    !tbase_get_deferrable(timer->base))

		base->next_timer = timer->expires;

	internal_add_timer(base, timer);



out_unlock:
@@ -925,9 +934,6 @@ void add_timer_on(struct timer_list *timer, int cpu) 
	spin_lock_irqsave(&base->lock, flags);

	timer_set_base(timer, base);

	debug_activate(timer, timer->expires);

	if (time_before(timer->expires, base->next_timer) &&

	    !tbase_get_deferrable(timer->base))

		base->next_timer = timer->expires;

	internal_add_timer(base, timer);

	/*

	 * Check whether the other CPU is idle and needs to be
@@ -1079,7 +1085,8 @@ static int cascade(struct tvec_base *base, struct tvec *tv, int index) 
	 */

	list_for_each_entry_safe(timer, tmp, &tv_list, entry) {

		BUG_ON(tbase_get_base(timer->base) != base);

		internal_add_timer(base, timer);

		/* No accounting, while moving them */

		__internal_add_timer(base, timer);

	}



	return index;
@@ -1706,9 +1713,6 @@ static void migrate_timer_list(struct tvec_base *new_base, struct list_head *hea 
		timer = list_first_entry(head, struct timer_list, entry);

		detach_timer(timer, false);

		timer_set_base(timer, new_base);

		if (time_before(timer->expires, new_base->next_timer) &&

		    !tbase_get_deferrable(timer->base))

			new_base->next_timer = timer->expires;

		internal_add_timer(new_base, timer);

	}

}