Merge tag 'remove-local-timers' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / arch / arm / kernel / smp_twd.c

diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c
index aac1495b44dec142de71dff6c58509c63ce2570d..2985c9f0905d0e8667210e7bcdc0b51765781524 100644 (file)
--- a/arch/arm/kernel/smp_twd.c
+++ b/arch/arm/kernel/smp_twd.c
@@ -122,7 +122,7 @@ static int twd_rate_change(struct notifier_block *nb,
         * changing cpu.
         */
        if (flags == POST_RATE_CHANGE)
-               smp_call_function(twd_update_frequency,
+               on_each_cpu(twd_update_frequency,
                                  (void *)&cnd->new_rate, 1);
 
        return NOTIFY_OK;
@@ -189,7 +189,7 @@ core_initcall(twd_cpufreq_init);
 
 #endif
 
-static void __cpuinit twd_calibrate_rate(void)
+static void twd_calibrate_rate(void)
 {
        unsigned long count;
        u64 waitjiffies;
@@ -267,7 +267,7 @@ static void twd_get_clock(struct device_node *np)
 /*
  * Setup the local clock events for a CPU.
  */
-static void __cpuinit twd_timer_setup(void)
+static void twd_timer_setup(void)
 {
        struct clock_event_device *clk = __this_cpu_ptr(twd_evt);
        int cpu = smp_processor_id();
@@ -306,8 +306,8 @@ static void __cpuinit twd_timer_setup(void)
        enable_percpu_irq(clk->irq, 0);
 }
 
-static int __cpuinit twd_timer_cpu_notify(struct notifier_block *self,
-                                          unsigned long action, void *hcpu)
+static int twd_timer_cpu_notify(struct notifier_block *self,
+                               unsigned long action, void *hcpu)
 {
        switch (action & ~CPU_TASKS_FROZEN) {
        case CPU_STARTING:
@@ -321,7 +321,7 @@ static int __cpuinit twd_timer_cpu_notify(struct notifier_block *self,
        return NOTIFY_OK;
 }
 
-static struct notifier_block twd_timer_cpu_nb __cpuinitdata = {
+static struct notifier_block twd_timer_cpu_nb = {
        .notifier_call = twd_timer_cpu_notify,
 };