1 files changed, 9 insertions, 22 deletions

diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index a2b254189782..ffadd836e0b5 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -123,7 +123,7 @@ static int arch_timer_set_next_event_phys(unsigned long evt,
         return 0;
 }
 
-static int __cpuinit arch_timer_setup(struct clock_event_device *clk)
+static int arch_timer_setup(struct clock_event_device *clk)
 {
         clk->features = CLOCK_EVT_FEAT_ONESHOT | CLOCK_EVT_FEAT_C3STOP;
         clk->name = "arch_sys_timer";
@@ -186,27 +186,19 @@ u32 arch_timer_get_rate(void)
         return arch_timer_rate;
 }
 
-/*
- * Some external users of arch_timer_read_counter (e.g. sched_clock) may try to
- * call it before it has been initialised. Rather than incur a performance
- * penalty checking for initialisation, provide a default implementation that
- * won't lead to time appearing to jump backwards.
- */
-static u64 arch_timer_read_zero(void)
+u64 arch_timer_read_counter(void)
 {
-        return 0;
+        return arch_counter_get_cntvct();
 }
 
-u64 (*arch_timer_read_counter)(void) = arch_timer_read_zero;
-
 static cycle_t arch_counter_read(struct clocksource *cs)
 {
-        return arch_timer_read_counter();
+        return arch_counter_get_cntvct();
 }
 
 static cycle_t arch_counter_read_cc(const struct cyclecounter *cc)
 {
-        return arch_timer_read_counter();
+        return arch_counter_get_cntvct();
 }
 
 static struct clocksource clocksource_counter = {
@@ -229,7 +221,7 @@ struct timecounter *arch_timer_get_timecounter(void)
         return &timecounter;
 }
 
-static void __cpuinit arch_timer_stop(struct clock_event_device *clk)
+static void arch_timer_stop(struct clock_event_device *clk)
 {
         pr_debug("arch_timer_teardown disable IRQ%d cpu #%d\n",
                  clk->irq, smp_processor_id());
@@ -245,7 +237,7 @@ static void __cpuinit arch_timer_stop(struct clock_event_device *clk)
         clk->set_mode(CLOCK_EVT_MODE_UNUSED, clk);
 }
 
-static int __cpuinit arch_timer_cpu_notify(struct notifier_block *self,
+static int arch_timer_cpu_notify(struct notifier_block *self,
                                            unsigned long action, void *hcpu)
 {
         /*
@@ -264,7 +256,7 @@ static int __cpuinit arch_timer_cpu_notify(struct notifier_block *self,
         return NOTIFY_OK;
 }
 
-static struct notifier_block arch_timer_cpu_nb __cpuinitdata = {
+static struct notifier_block arch_timer_cpu_nb = {
         .notifier_call = arch_timer_cpu_notify,
 };
 
@@ -287,7 +279,7 @@ static int __init arch_timer_register(void)
         cyclecounter.mult = clocksource_counter.mult;
         cyclecounter.shift = clocksource_counter.shift;
         timecounter_init(&timecounter, &cyclecounter,
-                         arch_counter_get_cntpct());
+                         arch_counter_get_cntvct());
 
         if (arch_timer_use_virtual) {
                 ppi = arch_timer_ppi[VIRT_PPI];
@@ -376,11 +368,6 @@ static void __init arch_timer_init(struct device_node *np)
                 }
         }
 
-        if (arch_timer_use_virtual)
-                arch_timer_read_counter = arch_counter_get_cntvct;
-        else
-                arch_timer_read_counter = arch_counter_get_cntpct;
-
         arch_timer_register();
         arch_timer_arch_init();
 }