diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-12 15:16:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-12 15:16:26 -0700 |
| commit | ccb1ec95e924a24906ef01ce6d028a8dc13dc87d (patch) | |
| tree | b16a02083ba6843fe3f2513f74a72c95d43ddccb /kernel/time/tick-broadcast.c | |
| parent | 4a1d7544fee5e601a4e642ce2720689f90428d65 (diff) | |
| parent | d48fc63f6f3f485ed5aa9cf019d8e8e3a7d10263 (diff) | |
| download | linux-ccb1ec95e924a24906ef01ce6d028a8dc13dc87d.tar.gz linux-ccb1ec95e924a24906ef01ce6d028a8dc13dc87d.tar.bz2 linux-ccb1ec95e924a24906ef01ce6d028a8dc13dc87d.zip | |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Thomas Gleixner:
"The itimer removal one is not strictly a fix, but I really wanted to
avoid a rebase of the urgent ones."
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
Revert "clocksource: Load the ACPI PM clocksource asynchronously"
clockevents: tTack broadcast device mode change in tick_broadcast_switch_to_oneshot()
itimer: Use printk_once instead of WARN_ONCE
nohz: Fix stale jiffies update in tick_nohz_restart()
tick: Document TICK_ONESHOT config option
proc: stats: Use arch_idle_time for idle and iowait times if available
itimer: Schedule silent NULL pointer fixup in setitimer() for removal
Diffstat (limited to 'kernel/time/tick-broadcast.c')
| -rw-r--r-- | kernel/time/tick-broadcast.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c index e883f57a3cd3..bf57abdc7bd0 100644 --- a/kernel/time/tick-broadcast.c +++ b/kernel/time/tick-broadcast.c @@ -575,10 +575,12 @@ void tick_broadcast_switch_to_oneshot(void) unsigned long flags; raw_spin_lock_irqsave(&tick_broadcast_lock, flags); + + tick_broadcast_device.mode = TICKDEV_MODE_ONESHOT; + if (cpumask_empty(tick_get_broadcast_mask())) goto end; - tick_broadcast_device.mode = TICKDEV_MODE_ONESHOT; bc = tick_broadcast_device.evtdev; if (bc) tick_broadcast_setup_oneshot(bc); |