lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2013-06-29 10:27:19 -07:00
parent 82d0b80ad6 ea8deb8dfa
commit a75930c633
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
kernel/time/tick-broadcast.c
View File

@@ -599,8 +599,6 @@ void tick_broadcast_oneshot_control(unsigned long reason)
} else { } else {
if (cpumask_test_and_clear_cpu(cpu, tick_broadcast_oneshot_mask)) { if (cpumask_test_and_clear_cpu(cpu, tick_broadcast_oneshot_mask)) {
clockevents_set_mode(dev, CLOCK_EVT_MODE_ONESHOT); clockevents_set_mode(dev, CLOCK_EVT_MODE_ONESHOT);
if (dev->next_event.tv64 == KTIME_MAX)
goto out;
/* /*
* The cpu which was handling the broadcast * The cpu which was handling the broadcast
* timer marked this cpu in 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)) tick_broadcast_pending_mask))
goto out; 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 * If the pending bit is not set, then we are
* either the CPU handling the broadcast * either the CPU handling the broadcast