Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

[pandora-kernel.git] / drivers / cpufreq / cpufreq_userspace.c

diff --git a/drivers/cpufreq/cpufreq_userspace.c b/drivers/cpufreq/cpufreq_userspace.c
index cb2ac01..1442bba 100644 (file)
--- a/drivers/cpufreq/cpufreq_userspace.c
+++ b/drivers/cpufreq/cpufreq_userspace.c
@@ -30,16 +30,18 @@
 /**
  * A few values needed by the userspace governor
  */
-static unsigned int    cpu_max_freq[NR_CPUS];
-static unsigned int    cpu_min_freq[NR_CPUS];
-static unsigned int    cpu_cur_freq[NR_CPUS]; /* current CPU freq */
-static unsigned int    cpu_set_freq[NR_CPUS]; /* CPU freq desired by userspace */
-static unsigned int    cpu_is_managed[NR_CPUS];
+static DEFINE_PER_CPU(unsigned int, cpu_max_freq);
+static DEFINE_PER_CPU(unsigned int, cpu_min_freq);
+static DEFINE_PER_CPU(unsigned int, cpu_cur_freq); /* current CPU freq */
+static DEFINE_PER_CPU(unsigned int, cpu_set_freq); /* CPU freq desired by
+                                                       userspace */
+static DEFINE_PER_CPU(unsigned int, cpu_is_managed);
 
 static DEFINE_MUTEX    (userspace_mutex);
 static int cpus_using_userspace_governor;
 
-#define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_GOVERNOR, "userspace", msg)
+#define dprintk(msg...) \
+       cpufreq_debug_printk(CPUFREQ_DEBUG_GOVERNOR, "userspace", msg)
 
 /* keep track of frequency transitions */
 static int
@@ -48,12 +50,12 @@ userspace_cpufreq_notifier(struct notifier_block *nb, unsigned long val,
 {
         struct cpufreq_freqs *freq = data;
 
-       if (!cpu_is_managed[freq->cpu])
+       if (!per_cpu(cpu_is_managed, freq->cpu))
                return 0;
 
        dprintk("saving cpu_cur_freq of cpu %u to be %u kHz\n",
                        freq->cpu, freq->new);
-       cpu_cur_freq[freq->cpu] = freq->new;
+       per_cpu(cpu_cur_freq, freq->cpu) = freq->new;
 
         return 0;
 }
@@ -77,15 +79,15 @@ static int cpufreq_set(struct cpufreq_policy *policy, unsigned int freq)
        dprintk("cpufreq_set for cpu %u, freq %u kHz\n", policy->cpu, freq);
 
        mutex_lock(&userspace_mutex);
-       if (!cpu_is_managed[policy->cpu])
+       if (!per_cpu(cpu_is_managed, policy->cpu))
                goto err;
 
-       cpu_set_freq[policy->cpu] = freq;
+       per_cpu(cpu_set_freq, policy->cpu) = freq;
 
-       if (freq < cpu_min_freq[policy->cpu])
-               freq = cpu_min_freq[policy->cpu];
-       if (freq > cpu_max_freq[policy->cpu])
-               freq = cpu_max_freq[policy->cpu];
+       if (freq < per_cpu(cpu_min_freq, policy->cpu))
+               freq = per_cpu(cpu_min_freq, policy->cpu);
+       if (freq > per_cpu(cpu_max_freq, policy->cpu))
+               freq = per_cpu(cpu_max_freq, policy->cpu);
 
        /*
         * We're safe from concurrent calls to ->target() here
@@ -104,7 +106,7 @@ static int cpufreq_set(struct cpufreq_policy *policy, unsigned int freq)
 
 static ssize_t show_speed(struct cpufreq_policy *policy, char *buf)
 {
-       return sprintf(buf, "%u\n", cpu_cur_freq[policy->cpu]);
+       return sprintf(buf, "%u\n", per_cpu(cpu_cur_freq, policy->cpu));
 }
 
 static int cpufreq_governor_userspace(struct cpufreq_policy *policy,
@@ -127,12 +129,17 @@ static int cpufreq_governor_userspace(struct cpufreq_policy *policy,
                }
                cpus_using_userspace_governor++;
 
-               cpu_is_managed[cpu] = 1;
-               cpu_min_freq[cpu] = policy->min;
-               cpu_max_freq[cpu] = policy->max;
-               cpu_cur_freq[cpu] = policy->cur;
-               cpu_set_freq[cpu] = policy->cur;
-               dprintk("managing cpu %u started (%u - %u kHz, currently %u kHz)\n", cpu, cpu_min_freq[cpu], cpu_max_freq[cpu], cpu_cur_freq[cpu]);
+               per_cpu(cpu_is_managed, cpu) = 1;
+               per_cpu(cpu_min_freq, cpu) = policy->min;
+               per_cpu(cpu_max_freq, cpu) = policy->max;
+               per_cpu(cpu_cur_freq, cpu) = policy->cur;
+               per_cpu(cpu_set_freq, cpu) = policy->cur;
+               dprintk("managing cpu %u started "
+                       "(%u - %u kHz, currently %u kHz)\n",
+                               cpu,
+                               per_cpu(cpu_min_freq, cpu),
+                               per_cpu(cpu_max_freq, cpu),
+                               per_cpu(cpu_cur_freq, cpu));
 
                mutex_unlock(&userspace_mutex);
                break;
@@ -145,34 +152,34 @@ static int cpufreq_governor_userspace(struct cpufreq_policy *policy,
                                        CPUFREQ_TRANSITION_NOTIFIER);
                }
 
-               cpu_is_managed[cpu] = 0;
-               cpu_min_freq[cpu] = 0;
-               cpu_max_freq[cpu] = 0;
-               cpu_set_freq[cpu] = 0;
+               per_cpu(cpu_is_managed, cpu) = 0;
+               per_cpu(cpu_min_freq, cpu) = 0;
+               per_cpu(cpu_max_freq, cpu) = 0;
+               per_cpu(cpu_set_freq, cpu) = 0;
                dprintk("managing cpu %u stopped\n", cpu);
                mutex_unlock(&userspace_mutex);
                break;
        case CPUFREQ_GOV_LIMITS:
                mutex_lock(&userspace_mutex);
-               dprintk("limit event for cpu %u: %u - %u kHz,"
+               dprintk("limit event for cpu %u: %u - %u kHz, "
                        "currently %u kHz, last set to %u kHz\n",
                        cpu, policy->min, policy->max,
-                       cpu_cur_freq[cpu], cpu_set_freq[cpu]);
-               if (policy->max < cpu_set_freq[cpu]) {
+                       per_cpu(cpu_cur_freq, cpu),
+                       per_cpu(cpu_set_freq, cpu));
+               if (policy->max < per_cpu(cpu_set_freq, cpu)) {
                        __cpufreq_driver_target(policy, policy->max,
                                                CPUFREQ_RELATION_H);
-               }
-               else if (policy->min > cpu_set_freq[cpu]) {
+               } else if (policy->min > per_cpu(cpu_set_freq, cpu)) {
                        __cpufreq_driver_target(policy, policy->min,
                                                CPUFREQ_RELATION_L);
-               }
-               else {
-                       __cpufreq_driver_target(policy, cpu_set_freq[cpu],
+               } else {
+                       __cpufreq_driver_target(policy,
+                                               per_cpu(cpu_set_freq, cpu),
                                                CPUFREQ_RELATION_L);
                }
-               cpu_min_freq[cpu] = policy->min;
-               cpu_max_freq[cpu] = policy->max;
-               cpu_cur_freq[cpu] = policy->cur;
+               per_cpu(cpu_min_freq, cpu) = policy->min;
+               per_cpu(cpu_max_freq, cpu) = policy->max;
+               per_cpu(cpu_cur_freq, cpu) = policy->cur;
                mutex_unlock(&userspace_mutex);
                break;
        }
@@ -180,6 +187,9 @@ static int cpufreq_governor_userspace(struct cpufreq_policy *policy,
 }
 
 
+#ifndef CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE
+static
+#endif
 struct cpufreq_governor cpufreq_gov_userspace = {
        .name           = "userspace",
        .governor       = cpufreq_governor_userspace,
@@ -187,7 +197,6 @@ struct cpufreq_governor cpufreq_gov_userspace = {
        .show_setspeed  = show_speed,
        .owner          = THIS_MODULE,
 };
-EXPORT_SYMBOL(cpufreq_gov_userspace);
 
 static int __init cpufreq_gov_userspace_init(void)
 {