diff options
| author | Linus Torvalds | 2011-12-06 01:53:43 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2011-12-06 01:53:43 +0100 |
| commit | 40c043b077c6e377c8440d71563c055d0c4f0f0a (patch) | |
| tree | e0c1d672a1156d7840d3ef650ba1aa963c68e13a /kernel/time/tick-broadcast.c | |
| parent | Merge branches 'core-urgent-for-linus' and 'irq-urgent-for-linus' of git://gi... (diff) | |
| parent | clockevents: Set noop handler in clockevents_exchange_device() (diff) | |
| download | kernel-qcow2-linux-40c043b077c6e377c8440d71563c055d0c4f0f0a.tar.gz kernel-qcow2-linux-40c043b077c6e377c8440d71563c055d0c4f0f0a.tar.xz kernel-qcow2-linux-40c043b077c6e377c8440d71563c055d0c4f0f0a.zip | |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
clockevents: Set noop handler in clockevents_exchange_device()
tick-broadcast: Stop active broadcast device when replacing it
clocksource: Fix bug with max_deferment margin calculation
rtc: Fix some bugs that allowed accumulating time drift in suspend/resume
rtc: Disable the alarm in the hardware
Diffstat (limited to 'kernel/time/tick-broadcast.c')
| -rw-r--r-- | kernel/time/tick-broadcast.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c index f954282d9a82..fd4a7b1625a2 100644 --- a/kernel/time/tick-broadcast.c +++ b/kernel/time/tick-broadcast.c @@ -71,7 +71,7 @@ int tick_check_broadcast_device(struct clock_event_device *dev) (dev->features & CLOCK_EVT_FEAT_C3STOP)) return 0; - clockevents_exchange_device(NULL, dev); + clockevents_exchange_device(tick_broadcast_device.evtdev, dev); tick_broadcast_device.evtdev = dev; if (!cpumask_empty(tick_get_broadcast_mask())) tick_broadcast_start_periodic(dev); |