2 files changed, 51 insertions, 57 deletions

diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig
index d155e81b5c97..993fa7b89253 100644
--- a/drivers/cpufreq/Kconfig
+++ b/drivers/cpufreq/Kconfig
@@ -9,6 +9,9 @@ config CPU_FREQ
           clock speed, you need to either enable a dynamic cpufreq governor
           (see below) after boot, or use a userspace tool.
 
+          To compile this driver as a module, choose M here: the
+          module will be called cpufreq.
+
           For details, take a look at <file:Documentation/cpu-freq>.
 
           If in doubt, say N.
@@ -16,7 +19,7 @@ config CPU_FREQ
 if CPU_FREQ
 
 config CPU_FREQ_TABLE
-       tristate
+        tristate
 
 config CPU_FREQ_DEBUG
         bool "Enable CPUfreq debugging"
@@ -32,19 +35,26 @@ config CPU_FREQ_DEBUG
                4 to activate CPUfreq governor debugging
 
 config CPU_FREQ_STAT
-       tristate "CPU frequency translation statistics"
-       select CPU_FREQ_TABLE
-       default y
-       help
-         This driver exports CPU frequency statistics information through sysfs
-         file system
+        tristate "CPU frequency translation statistics"
+        select CPU_FREQ_TABLE
+        default y
+        help
+          This driver exports CPU frequency statistics information through sysfs
+          file system.
+
+          To compile this driver as a module, choose M here: the
+          module will be called cpufreq_stats.
+
+          If in doubt, say N.
 
 config CPU_FREQ_STAT_DETAILS
-       bool "CPU frequency translation statistics details"
-       depends on CPU_FREQ_STAT
-       help
-         This will show detail CPU frequency translation table in sysfs file
-         system
+        bool "CPU frequency translation statistics details"
+        depends on CPU_FREQ_STAT
+        help
+          This will show detail CPU frequency translation table in sysfs file
+          system.
+
+          If in doubt, say N.
 
 # Note that it is not currently possible to set the other governors (such as ondemand)
 # as the default, since if they fail to initialise, cpufreq will be
@@ -78,29 +88,38 @@ config CPU_FREQ_DEFAULT_GOV_USERSPACE
 endchoice
 
 config CPU_FREQ_GOV_PERFORMANCE
-       tristate "'performance' governor"
-       help
+        tristate "'performance' governor"
+        help
           This cpufreq governor sets the frequency statically to the
           highest available CPU frequency.
 
+          To compile this driver as a module, choose M here: the
+          module will be called cpufreq_performance.
+
           If in doubt, say Y.
 
 config CPU_FREQ_GOV_POWERSAVE
-       tristate "'powersave' governor"
-       help
+        tristate "'powersave' governor"
+        help
           This cpufreq governor sets the frequency statically to the
           lowest available CPU frequency.
 
+          To compile this driver as a module, choose M here: the
+          module will be called cpufreq_powersave.
+
           If in doubt, say Y.
 
 config CPU_FREQ_GOV_USERSPACE
-       tristate "'userspace' governor for userspace frequency scaling"
-       help
+        tristate "'userspace' governor for userspace frequency scaling"
+        help
           Enable this cpufreq governor when you either want to set the
           CPU frequency manually or when an userspace program shall
           be able to set the CPU dynamically, like on LART 
           <http://www.lartmaker.nl/>.
 
+          To compile this driver as a module, choose M here: the
+          module will be called cpufreq_userspace.
+
           For details, take a look at <file:Documentation/cpu-freq/>.
 
           If in doubt, say Y.
@@ -116,6 +135,9 @@ config CPU_FREQ_GOV_ONDEMAND
           do fast frequency switching (i.e, very low latency frequency
           transitions). 
 
+          To compile this driver as a module, choose M here: the
+          module will be called cpufreq_ondemand.
+
           For details, take a look at linux/Documentation/cpu-freq.
 
           If in doubt, say N.
@@ -136,6 +158,9 @@ config CPU_FREQ_GOV_CONSERVATIVE
           step-by-step latency issues between the minimum and maximum frequency
           transitions in the CPU) you will probably want to use this governor.
 
+          To compile this driver as a module, choose M here: the
+          module will be called cpufreq_conservative.
+
           For details, take a look at linux/Documentation/cpu-freq.
 
           If in doubt, say N.
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 3162010900c9..893dbaf386fb 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -768,6 +768,9 @@ static int cpufreq_add_dev (struct sys_device * sys_dev)
                 unlock_policy_rwsem_write(cpu);
                 goto err_out;
         }
+        policy->user_policy.min = policy->cpuinfo.min_freq;
+        policy->user_policy.max = policy->cpuinfo.max_freq;
+        policy->user_policy.governor = policy->governor;
 
 #ifdef CONFIG_SMP
         for_each_cpu_mask(j, policy->cpus) {
@@ -858,10 +861,13 @@ static int cpufreq_add_dev (struct sys_device * sys_dev)
 
         policy->governor = NULL; /* to assure that the starting sequence is
                                   * run in cpufreq_set_policy */
-        unlock_policy_rwsem_write(cpu);
 
         /* set default policy */
-        ret = cpufreq_set_policy(&new_policy);
+        ret = __cpufreq_set_policy(policy, &new_policy);
+        policy->user_policy.policy = policy->policy;
+
+        unlock_policy_rwsem_write(cpu);
+
         if (ret) {
                 dprintk("setting policy failed\n");
                 goto err_out_unregister;
@@ -1620,43 +1626,6 @@ error_out:
 }
 
 /**
- *      cpufreq_set_policy - set a new CPUFreq policy
- *      @policy: policy to be set.
- *
- *      Sets a new CPU frequency and voltage scaling policy.
- */
-int cpufreq_set_policy(struct cpufreq_policy *policy)
-{
-        int ret = 0;
-        struct cpufreq_policy *data;
-
-        if (!policy)
-                return -EINVAL;
-
-        data = cpufreq_cpu_get(policy->cpu);
-        if (!data)
-                return -EINVAL;
-
-        if (unlikely(lock_policy_rwsem_write(policy->cpu)))
-                return -EINVAL;
-
-
-        ret = __cpufreq_set_policy(data, policy);
-        data->user_policy.min = data->min;
-        data->user_policy.max = data->max;
-        data->user_policy.policy = data->policy;
-        data->user_policy.governor = data->governor;
-
-        unlock_policy_rwsem_write(policy->cpu);
-
-        cpufreq_cpu_put(data);
-
-        return ret;
-}
-EXPORT_SYMBOL(cpufreq_set_policy);
-
-
-/**
  *      cpufreq_update_policy - re-evaluate an existing cpufreq policy
  *      @cpu: CPU which shall be re-evaluated
  *