1 files changed, 21 insertions, 20 deletions

diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
index e69fd8dd1f1c..9ee9411f186f 100644
--- a/drivers/cpufreq/cpufreq_ondemand.c
+++ b/drivers/cpufreq/cpufreq_ondemand.c
@@ -27,6 +27,7 @@
 #include <linux/jiffies.h>
 #include <linux/kernel_stat.h>
 #include <linux/percpu.h>
+#include <linux/mutex.h>
 
 /*
  * dbs is used in this file as a shortform for demandbased switching
@@ -70,7 +71,7 @@ static DEFINE_PER_CPU(struct cpu_dbs_info_s, cpu_dbs_info);
 
 static unsigned int dbs_enable; /* number of CPUs using this policy */
 
-static DECLARE_MUTEX    (dbs_sem);
+static DEFINE_MUTEX     (dbs_mutex);
 static DECLARE_WORK     (dbs_work, do_dbs_timer, NULL);
 
 struct dbs_tuners {
@@ -136,9 +137,9 @@ static ssize_t store_sampling_down_factor(struct cpufreq_policy *unused,
         if (input > MAX_SAMPLING_DOWN_FACTOR || input < 1)
                 return -EINVAL;
 
-        down(&dbs_sem);
+        mutex_lock(&dbs_mutex);
         dbs_tuners_ins.sampling_down_factor = input;
-        up(&dbs_sem);
+        mutex_unlock(&dbs_mutex);
 
         return count;
 }
@@ -150,14 +151,14 @@ static ssize_t store_sampling_rate(struct cpufreq_policy *unused,
         int ret;
         ret = sscanf (buf, "%u", &input);
 
-        down(&dbs_sem);
+        mutex_lock(&dbs_mutex);
         if (ret != 1 || input > MAX_SAMPLING_RATE || input < MIN_SAMPLING_RATE) {
-                up(&dbs_sem);
+                mutex_unlock(&dbs_mutex);
                 return -EINVAL;
         }
 
         dbs_tuners_ins.sampling_rate = input;
-        up(&dbs_sem);
+        mutex_unlock(&dbs_mutex);
 
         return count;
 }
@@ -169,15 +170,15 @@ static ssize_t store_up_threshold(struct cpufreq_policy *unused,
         int ret;
         ret = sscanf (buf, "%u", &input);
 
-        down(&dbs_sem);
+        mutex_lock(&dbs_mutex);
         if (ret != 1 || input > MAX_FREQUENCY_UP_THRESHOLD || 
                         input < MIN_FREQUENCY_UP_THRESHOLD) {
-                up(&dbs_sem);
+                mutex_unlock(&dbs_mutex);
                 return -EINVAL;
         }
 
         dbs_tuners_ins.up_threshold = input;
-        up(&dbs_sem);
+        mutex_unlock(&dbs_mutex);
 
         return count;
 }
@@ -197,9 +198,9 @@ static ssize_t store_ignore_nice_load(struct cpufreq_policy *policy,
         if ( input > 1 )
                 input = 1;
         
-        down(&dbs_sem);
+        mutex_lock(&dbs_mutex);
         if ( input == dbs_tuners_ins.ignore_nice ) { /* nothing to do */
-                up(&dbs_sem);
+                mutex_unlock(&dbs_mutex);
                 return count;
         }
         dbs_tuners_ins.ignore_nice = input;
@@ -211,7 +212,7 @@ static ssize_t store_ignore_nice_load(struct cpufreq_policy *policy,
                 j_dbs_info->prev_cpu_idle_up = get_cpu_idle_time(j);
                 j_dbs_info->prev_cpu_idle_down = j_dbs_info->prev_cpu_idle_up;
         }
-        up(&dbs_sem);
+        mutex_unlock(&dbs_mutex);
 
         return count;
 }
@@ -356,12 +357,12 @@ static void dbs_check_cpu(int cpu)
 static void do_dbs_timer(void *data)
 { 
         int i;
-        down(&dbs_sem);
+        mutex_lock(&dbs_mutex);
         for_each_online_cpu(i)
                 dbs_check_cpu(i);
         schedule_delayed_work(&dbs_work, 
                         usecs_to_jiffies(dbs_tuners_ins.sampling_rate));
-        up(&dbs_sem);
+        mutex_unlock(&dbs_mutex);
 } 
 
 static inline void dbs_timer_init(void)
@@ -399,7 +400,7 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
                 if (this_dbs_info->enable) /* Already enabled */
                         break;
                  
-                down(&dbs_sem);
+                mutex_lock(&dbs_mutex);
                 for_each_cpu_mask(j, policy->cpus) {
                         struct cpu_dbs_info_s *j_dbs_info;
                         j_dbs_info = &per_cpu(cpu_dbs_info, j);
@@ -435,11 +436,11 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
                         dbs_timer_init();
                 }
                 
-                up(&dbs_sem);
+                mutex_unlock(&dbs_mutex);
                 break;
 
         case CPUFREQ_GOV_STOP:
-                down(&dbs_sem);
+                mutex_lock(&dbs_mutex);
                 this_dbs_info->enable = 0;
                 sysfs_remove_group(&policy->kobj, &dbs_attr_group);
                 dbs_enable--;
@@ -450,12 +451,12 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
                 if (dbs_enable == 0) 
                         dbs_timer_exit();
                 
-                up(&dbs_sem);
+                mutex_unlock(&dbs_mutex);
 
                 break;
 
         case CPUFREQ_GOV_LIMITS:
-                down(&dbs_sem);
+                mutex_lock(&dbs_mutex);
                 if (policy->max < this_dbs_info->cur_policy->cur)
                         __cpufreq_driver_target(
                                         this_dbs_info->cur_policy,
@@ -464,7 +465,7 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
                         __cpufreq_driver_target(
                                         this_dbs_info->cur_policy,
                                         policy->min, CPUFREQ_RELATION_L);
-                up(&dbs_sem);
+                mutex_unlock(&dbs_mutex);
                 break;
         }
         return 0;