Commit-ID: c1be84309c58b1e7c6d626e28fba41a22b364c3d Gitweb: http://git.kernel.org/tip/c1be84309c58b1e7c6d626e28fba41a22b364c3d Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx> AuthorDate: Fri, 2 Dec 2011 12:34:16 +0100 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitDate: Fri, 2 Dec 2011 16:06:54 +0100 tick-broadcast: Stop active broadcast device when replacing it When a better rated broadcast device is installed, then the current active device is not disabled, which results in two running broadcast devices. Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: stable@xxxxxxxxxxxxxxx --- 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 f954282..fd4a7b1 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); -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html