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

Commit 95d08585 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull timer fix from Thomas Gleixner:
 "A single bug fix for a long standing issue:

   - Updating the expiry value of a relative timer _after_ letting the
     idle logic select a target cpu for the timer based on its stale
     expiry value is outright stupid.  Thanks to Viresh for spotting the
     brainfart"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  hrtimer: Set expiry time before switch_hrtimer_base()
parents 3f017a4c 84ea7fe3

kernel/hrtimer.c

+4 −4
Original line number Diff line number Diff line
@@ -990,11 +990,8 @@ int __hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim, 
	/* Remove an active timer from the queue: */

	ret = remove_hrtimer(timer, base);



	/* Switch the timer base, if necessary: */

	new_base = switch_hrtimer_base(timer, base, mode & HRTIMER_MODE_PINNED);



	if (mode & HRTIMER_MODE_REL) {

		tim = ktime_add_safe(tim, new_base->get_time());

		tim = ktime_add_safe(tim, base->get_time());

		/*

		 * CONFIG_TIME_LOW_RES is a temporary way for architectures

		 * to signal that they simply return xtime in
@@ -1009,6 +1006,9 @@ int __hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim, 


	hrtimer_set_expires_range_ns(timer, tim, delta_ns);



	/* Switch the timer base, if necessary: */

	new_base = switch_hrtimer_base(timer, base, mode & HRTIMER_MODE_PINNED);



	timer_stats_hrtimer_set_start_info(timer);



	leftmost = enqueue_hrtimer(timer, new_base);