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

Commit a75930c6 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:
 "Correct an ordering issue in the tick broadcast code.  I really wish
  we'd get compensation for pain and suffering for each line of code we
  write to work around dysfunctional timer hardware."

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  tick: Fix tick_broadcast_pending_mask not cleared
parents 82d0b80a ea8deb8d

kernel/time/tick-broadcast.c

+5 −2
Original line number Diff line number Diff line
@@ -599,8 +599,6 @@ void tick_broadcast_oneshot_control(unsigned long reason) 
	} else {

		if (cpumask_test_and_clear_cpu(cpu, tick_broadcast_oneshot_mask)) {

			clockevents_set_mode(dev, CLOCK_EVT_MODE_ONESHOT);

			if (dev->next_event.tv64 == KTIME_MAX)

				goto out;

			/*

			 * The cpu which was handling the broadcast

			 * timer marked this cpu in the broadcast
@@ -614,6 +612,11 @@ void tick_broadcast_oneshot_control(unsigned long reason) 
				       tick_broadcast_pending_mask))

				goto out;



			/*

			 * Bail out if there is no next event.

			 */

			if (dev->next_event.tv64 == KTIME_MAX)

				goto out;

			/*

			 * If the pending bit is not set, then we are

			 * either the CPU handling the broadcast