| From da9e5fec4d08dc32cbaea1990c3732b91cf523cf Mon Sep 17 00:00:00 2001 |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Fri, 2 Dec 2011 12:34:16 +0100 |
| Subject: [PATCH 23/24] tick-broadcast: Stop active broadcast device when |
| replacing it |
| |
| commit c1be84309c58b1e7c6d626e28fba41a22b364c3d upstream. |
| |
| 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@linutronix.de> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| --- |
| kernel/time/tick-broadcast.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c |
| index 0f888cb..521987f 100644 |
| --- a/kernel/time/tick-broadcast.c |
| +++ b/kernel/time/tick-broadcast.c |
| @@ -72,7 +72,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); |
| -- |
| 1.7.12.1 |
| |
