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

[karo-tx-linux.git] / arch / arm / mach-msm / timer.c

diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c
index dacdcfdbc3424d57a99e91ebc1385f94323633ed..a7afbacae61a13715a61c790056fbfe58519d2ba 100644 (file)
--- a/arch/arm/mach-msm/timer.c
+++ b/arch/arm/mach-msm/timer.c
@@ -130,7 +130,7 @@ static struct clocksource msm_clocksource = {
 static int msm_timer_irq;
 static int msm_timer_has_ppi;
 
-static int __cpuinit msm_local_timer_setup(struct clock_event_device *evt)
+static int msm_local_timer_setup(struct clock_event_device *evt)
 {
        int cpu = smp_processor_id();
        int err;
@@ -158,13 +158,13 @@ static int __cpuinit msm_local_timer_setup(struct clock_event_device *evt)
        return 0;
 }
 
-static void __cpuinit msm_local_timer_stop(struct clock_event_device *evt)
+static void msm_local_timer_stop(struct clock_event_device *evt)
 {
        evt->set_mode(CLOCK_EVT_MODE_UNUSED, evt);
        disable_percpu_irq(evt->irq);
 }
 
-static int __cpuinit msm_timer_cpu_notify(struct notifier_block *self,
+static int msm_timer_cpu_notify(struct notifier_block *self,
                                           unsigned long action, void *hcpu)
 {
        /*
@@ -183,7 +183,7 @@ static int __cpuinit msm_timer_cpu_notify(struct notifier_block *self,
        return NOTIFY_OK;
 }
 
-static struct notifier_block msm_timer_cpu_nb __cpuinitdata = {
+static struct notifier_block msm_timer_cpu_nb = {
        .notifier_call = msm_timer_cpu_notify,
 };