[SPARC64]: update us3_cpufreq to support userspace governor.

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index be9f9f1e86d342d74efc27163f32659b49410409..6e55bad0a2b20bd588c05e2966232ad0bf8504f4 100644 (file)
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -150,18 +150,6 @@ config CPU_FREQ
 
          If in doubt, say N.
 
-config CPU_FREQ_PROC_INTF
-       tristate "/proc/cpufreq interface (DEPRECATED)"
-       depends on CPU_FREQ && PROC_FS
-       help
-         This enables the /proc/cpufreq interface for controlling
-         CPUFreq. Please note that it is recommended to use the sysfs
-         interface instead (which is built automatically). 
-         
-         For details, take a look at linux/Documentation/cpufreq. 
-         
-         If in doubt, say N.
-
 config CPU_FREQ_TABLE
        tristate
        default y
@@ -177,6 +165,8 @@ config US3_FREQ
 
          If in doubt, say N.
 
+source "drivers/cpufreq/Kconfig"
+
 # Identify this as a Sparc64 build
 config SPARC64
        bool

diff --git a/arch/sparc64/kernel/us3_cpufreq.c b/arch/sparc64/kernel/us3_cpufreq.c
index 15f528274bcc5a081bc474da013d45b41782fe74..fd1c359b32520c941e65628c1172765b8dfd7662 100644 (file)
--- a/arch/sparc64/kernel/us3_cpufreq.c
+++ b/arch/sparc64/kernel/us3_cpufreq.c
@@ -186,12 +186,16 @@ static void us3_set_cpu_divider_index(unsigned int cpu, unsigned int index)
        set_cpus_allowed(current, cpus_allowed);
 }
 
-static int us3freq_setpolicy(struct cpufreq_policy *policy)
+static int us3freq_target(struct cpufreq_policy *policy,
+                         unsigned int target_freq,
+                         unsigned int relation)
 {
        unsigned int new_index = 0;
 
-       if (cpufreq_frequency_table_setpolicy(policy,
+       if (cpufreq_frequency_table_target(policy,
                                              &us3_freq_table[policy->cpu].table[0],
+                                             target_freq,
+                                             relation,
                                              &new_index))
                return -EINVAL;
 
@@ -224,6 +228,7 @@ static int __init us3freq_cpu_init(struct cpufreq_policy *policy)
 
        policy->policy = CPUFREQ_POLICY_PERFORMANCE;
        policy->cpuinfo.transition_latency = 0;
+       policy->cur = clock_tick;
 
        return cpufreq_frequency_table_cpuinfo(policy, table);
 }
@@ -268,7 +273,7 @@ static int __init us3freq_init(void)
                       (NR_CPUS * sizeof(struct us3_freq_percpu_info)));
 
                driver->verify = us3freq_verify;
-               driver->setpolicy = us3freq_setpolicy;
+               driver->target = us3freq_target;
                driver->init = us3freq_cpu_init;
                driver->exit = us3freq_cpu_exit;
                strcpy(driver->name, "UltraSPARC-III");