1 files changed, 42 insertions, 16 deletions

diff --git a/drivers/clocksource/exynos_mct.c b/drivers/clocksource/exynos_mct.c
index b2bbc415f120..5b34768f4d7c 100644
--- a/drivers/clocksource/exynos_mct.c
+++ b/drivers/clocksource/exynos_mct.c
@@ -16,6 +16,7 @@
 #include <linux/err.h>
 #include <linux/clk.h>
 #include <linux/clockchips.h>
+#include <linux/cpu.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/percpu.h>
@@ -24,7 +25,6 @@
 #include <linux/of_address.h>
 #include <linux/clocksource.h>
 
-#include <asm/localtimer.h>
 #include <asm/mach/time.h>
 
 #define EXYNOS4_MCTREG(x)               (x)
@@ -80,7 +80,7 @@ static unsigned int mct_int_type;
 static int mct_irqs[MCT_NR_IRQS];
 
 struct mct_clock_event_device {
-        struct clock_event_device *evt;
+        struct clock_event_device evt;
         unsigned long base;
         char name[10];
 };
@@ -295,8 +295,6 @@ static void exynos4_clockevent_init(void)
         setup_irq(mct_irqs[MCT_G0_IRQ], &mct_comp_event_irq);
 }
 
-#ifdef CONFIG_LOCAL_TIMERS
-
 static DEFINE_PER_CPU(struct mct_clock_event_device, percpu_mct_tick);
 
 /* Clock event handling */
@@ -369,7 +367,7 @@ static inline void exynos4_tick_set_mode(enum clock_event_mode mode,
 
 static int exynos4_mct_tick_clear(struct mct_clock_event_device *mevt)
 {
-        struct clock_event_device *evt = mevt->evt;
+        struct clock_event_device *evt = &mevt->evt;
 
         /*
          * This is for supporting oneshot mode.
@@ -391,7 +389,7 @@ static int exynos4_mct_tick_clear(struct mct_clock_event_device *mevt)
 static irqreturn_t exynos4_mct_tick_isr(int irq, void *dev_id)
 {
         struct mct_clock_event_device *mevt = dev_id;
-        struct clock_event_device *evt = mevt->evt;
+        struct clock_event_device *evt = &mevt->evt;
 
         exynos4_mct_tick_clear(mevt);
 
@@ -405,8 +403,7 @@ static int exynos4_local_timer_setup(struct clock_event_device *evt)
         struct mct_clock_event_device *mevt;
         unsigned int cpu = smp_processor_id();
 
-        mevt = this_cpu_ptr(&percpu_mct_tick);
-        mevt->evt = evt;
+        mevt = container_of(evt, struct mct_clock_event_device, evt);
 
         mevt->base = EXYNOS4_MCT_L_BASE(cpu);
         sprintf(mevt->name, "mct_tick%d", cpu);
@@ -448,14 +445,37 @@ static void exynos4_local_timer_stop(struct clock_event_device *evt)
                 disable_percpu_irq(mct_irqs[MCT_L0_IRQ]);
 }
 
-static struct local_timer_ops exynos4_mct_tick_ops = {
-        .setup  = exynos4_local_timer_setup,
-        .stop   = exynos4_local_timer_stop,
+static int exynos4_mct_cpu_notify(struct notifier_block *self,
+                                           unsigned long action, void *hcpu)
+{
+        struct mct_clock_event_device *mevt;
+
+        /*
+         * Grab cpu pointer in each case to avoid spurious
+         * preemptible warnings
+         */
+        switch (action & ~CPU_TASKS_FROZEN) {
+        case CPU_STARTING:
+                mevt = this_cpu_ptr(&percpu_mct_tick);
+                exynos4_local_timer_setup(&mevt->evt);
+                break;
+        case CPU_DYING:
+                mevt = this_cpu_ptr(&percpu_mct_tick);
+                exynos4_local_timer_stop(&mevt->evt);
+                break;
+        }
+
+        return NOTIFY_OK;
+}
+
+static struct notifier_block exynos4_mct_cpu_nb = {
+        .notifier_call = exynos4_mct_cpu_notify,
 };
-#endif /* CONFIG_LOCAL_TIMERS */
 
 static void __init exynos4_timer_resources(struct device_node *np, void __iomem *base)
 {
+        int err;
+        struct mct_clock_event_device *mevt = this_cpu_ptr(&percpu_mct_tick);
         struct clk *mct_clk, *tick_clk;
 
         tick_clk = np ? of_clk_get_by_name(np, "fin_pll") :
@@ -473,9 +493,7 @@ static void __init exynos4_timer_resources(struct device_node *np, void __iomem
         if (!reg_base)
                 panic("%s: unable to ioremap mct address space\n", __func__);
 
-#ifdef CONFIG_LOCAL_TIMERS
         if (mct_int_type == MCT_INT_PPI) {
-                int err;
 
                 err = request_percpu_irq(mct_irqs[MCT_L0_IRQ],
                                          exynos4_mct_tick_isr, "MCT",
@@ -484,8 +502,16 @@ static void __init exynos4_timer_resources(struct device_node *np, void __iomem
                      mct_irqs[MCT_L0_IRQ], err);
         }
 
-        local_timer_register(&exynos4_mct_tick_ops);
-#endif /* CONFIG_LOCAL_TIMERS */
+        err = register_cpu_notifier(&exynos4_mct_cpu_nb);
+        if (err)
+                goto out_irq;
+
+        /* Immediately configure the timer on the boot CPU */
+        exynos4_local_timer_setup(&mevt->evt);
+        return;
+
+out_irq:
+        free_percpu_irq(mct_irqs[MCT_L0_IRQ], &percpu_mct_tick);
 }
 
 void __init mct_init(void __iomem *base, int irq_g0, int irq_l0, int irq_l1)