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

Commit c9192798 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'timers-for-linus-urgent' of... 

Merge branch 'timers-for-linus-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'timers-for-linus-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  hrtimer: Preserve timer state in remove_hrtimer()
parents 1bbee7d6 f13d4f97

kernel/hrtimer.c

+11 −2
Original line number Diff line number Diff line
@@ -931,6 +931,7 @@ static inline int 
remove_hrtimer(struct hrtimer *timer, struct hrtimer_clock_base *base)

{

	if (hrtimer_is_queued(timer)) {

		unsigned long state;

		int reprogram;



		/*
@@ -944,8 +945,13 @@ remove_hrtimer(struct hrtimer *timer, struct hrtimer_clock_base *base) 
		debug_deactivate(timer);

		timer_stats_hrtimer_clear_start_info(timer);

		reprogram = base->cpu_base == &__get_cpu_var(hrtimer_bases);

		__remove_hrtimer(timer, base, HRTIMER_STATE_INACTIVE,

				 reprogram);

		/*

		 * We must preserve the CALLBACK state flag here,

		 * otherwise we could move the timer base in

		 * switch_hrtimer_base.

		 */

		state = timer->state & HRTIMER_STATE_CALLBACK;

		__remove_hrtimer(timer, base, state, reprogram);

		return 1;

	}

	return 0;
@@ -1231,6 +1237,9 @@ static void __run_hrtimer(struct hrtimer *timer, ktime_t *now) 
		BUG_ON(timer->state != HRTIMER_STATE_CALLBACK);

		enqueue_hrtimer(timer, base);

	}



	WARN_ON_ONCE(!(timer->state & HRTIMER_STATE_CALLBACK));



	timer->state &= ~HRTIMER_STATE_CALLBACK;

}