X-Git-Url: https://nv-tegra.nvidia.com/r/gitweb?p=linux-3.10.git;a=blobdiff_plain;f=kernel%2Ftime%2Ftick-common.c;h=5d3fb100bc065285a9673e9f2cbe786ad734505d;hp=83f2bd967161460776207c3f4d354c1c0a06fe41;hb=534c97b0950b1967bca1c753aeaed32f5db40264;hpb=265f22a975c1e4cc3a4d1f94a3ec53ffbb6f5b9f

diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c
index 83f2bd96716..5d3fb100bc0 100644
--- a/kernel/time/tick-common.c
+++ b/kernel/time/tick-common.c
@@ -326,6 +326,7 @@ static void tick_shutdown(unsigned int *cpup)
 		 */
 		dev->mode = CLOCK_EVT_MODE_UNUSED;
 		clockevents_exchange_device(dev, NULL);
+		dev->event_handler = clockevents_handle_noop;
 		td->evtdev = NULL;
 	}
 	raw_spin_unlock_irqrestore(&tick_device_lock, flags);
@@ -419,4 +420,5 @@ static struct notifier_block tick_notifier = {
 void __init tick_init(void)
 {
 	clockevents_register_notifier(&tick_notifier);
+	tick_broadcast_init();
 }