revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

[firefly-linux-kernel-4.4.55.git] / drivers / oprofile / timer_int.c

diff --git a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c
index 010725117dbb0c81d042c7257a94724554425491..dc0ae4d14dffe25ab067f337907b77815121cfd3 100644 (file)
--- a/drivers/oprofile/timer_int.c
+++ b/drivers/oprofile/timer_int.c
@@ -21,7 +21,6 @@
 #include "oprof.h"
 
 static DEFINE_PER_CPU(struct hrtimer, oprofile_hrtimer);
-static int ctr_running;
 
 static enum hrtimer_restart oprofile_hrtimer_notify(struct hrtimer *hrtimer)
 {
@@ -34,9 +33,6 @@ static void __oprofile_hrtimer_start(void *unused)
 {
        struct hrtimer *hrtimer = &__get_cpu_var(oprofile_hrtimer);
 
-       if (!ctr_running)
-               return;
-
        hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
        hrtimer->function = oprofile_hrtimer_notify;
 
@@ -46,10 +42,7 @@ static void __oprofile_hrtimer_start(void *unused)
 
 static int oprofile_hrtimer_start(void)
 {
-       get_online_cpus();
-       ctr_running = 1;
        on_each_cpu(__oprofile_hrtimer_start, NULL, 1);
-       put_online_cpus();
        return 0;
 }
 
@@ -57,9 +50,6 @@ static void __oprofile_hrtimer_stop(int cpu)
 {
        struct hrtimer *hrtimer = &per_cpu(oprofile_hrtimer, cpu);
 
-       if (!ctr_running)
-               return;
-
        hrtimer_cancel(hrtimer);
 }
 
@@ -67,11 +57,8 @@ static void oprofile_hrtimer_stop(void)
 {
        int cpu;
 
-       get_online_cpus();
        for_each_online_cpu(cpu)
                __oprofile_hrtimer_stop(cpu);
-       ctr_running = 0;
-       put_online_cpus();
 }
 
 static int __cpuinit oprofile_cpu_notify(struct notifier_block *self,