From de96a2bd27608773d36e9d45daece850744eee9d Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Fri, 2 Dec 2011 12:34:16 +0100 Subject: [PATCH] --- yaml --- r: 276377 b: refs/heads/master c: c1be84309c58b1e7c6d626e28fba41a22b364c3d h: refs/heads/master i: 276375: cc03dc218f3c2d1f82ac4c383e62a06617330760 v: v3 --- [refs] | 2 +- trunk/kernel/time/tick-broadcast.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 03d112cc550b..f7e354be92da 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b1f919664d04a8d0ba29cb76673c7ca3325a2006 +refs/heads/master: c1be84309c58b1e7c6d626e28fba41a22b364c3d diff --git a/trunk/kernel/time/tick-broadcast.c b/trunk/kernel/time/tick-broadcast.c index f954282d9a82..fd4a7b1625a2 100644 --- a/trunk/kernel/time/tick-broadcast.c +++ b/trunk/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);