[CPUFREQ][X86] Small fixes necessary to separate the governors from policies.

diff --git a/arch/i386/kernel/cpu/cpufreq/acpi.c b/arch/i386/kernel/cpu/cpufreq/acpi.c
index 36cbb5015deb5ad6fdc73b19764479b325e13d0c..2b1e68cb66a62e0d101472627bf3e1d1b652f195 100644 (file)
--- a/arch/i386/kernel/cpu/cpufreq/acpi.c
+++ b/arch/i386/kernel/cpu/cpufreq/acpi.c
@@ -580,7 +580,7 @@ acpi_cpufreq_cpu_init (
                if (perf->states[i].transition_latency > policy->cpuinfo.transition_latency)
                        policy->cpuinfo.transition_latency = perf->states[i].transition_latency;
        }
-       policy->policy = CPUFREQ_POLICY_PERFORMANCE;
+       policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
        policy->cur = perf->states[pr->limit.state.px].core_frequency * 1000;
 
        /* table init */

diff --git a/arch/i386/kernel/cpu/cpufreq/elanfreq.c b/arch/i386/kernel/cpu/cpufreq/elanfreq.c
index 9214b2e0c360228c839b379849dd965be63b6373..a15f1ee967ad018c7095ad22026df684acd6bbc7 100644 (file)
--- a/arch/i386/kernel/cpu/cpufreq/elanfreq.c
+++ b/arch/i386/kernel/cpu/cpufreq/elanfreq.c
@@ -216,7 +216,7 @@ static int elanfreq_cpu_init(struct cpufreq_policy *policy)
        }
 
        /* cpuinfo and default policy values */
-       policy->policy = CPUFREQ_POLICY_PERFORMANCE;
+       policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
        policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
        policy->cur = elanfreq_get_cpu_frequency();
 

diff --git a/arch/i386/kernel/cpu/cpufreq/gx-suspmod.c b/arch/i386/kernel/cpu/cpufreq/gx-suspmod.c
index 0cec751f8ae8a2f8eb9cc1481f844938e72f7868..bb5471e2bc81f09022109782703c2a1f63eacfe5 100644 (file)
--- a/arch/i386/kernel/cpu/cpufreq/gx-suspmod.c
+++ b/arch/i386/kernel/cpu/cpufreq/gx-suspmod.c
@@ -434,7 +434,7 @@ static int cpufreq_gx_cpu_init(struct cpufreq_policy *policy)
                policy->min = maxfreq / POLICY_MIN_DIV;
        policy->max = maxfreq;
        policy->cur = curfreq;
-       policy->policy = CPUFREQ_POLICY_PERFORMANCE;
+       policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
        policy->cpuinfo.min_freq = maxfreq / max_duration;
        policy->cpuinfo.max_freq = maxfreq;
        policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;

diff --git a/arch/i386/kernel/cpu/cpufreq/longhaul.c b/arch/i386/kernel/cpu/cpufreq/longhaul.c
index 808f7f5079b16729b31badf232d77d85f3199c46..1e3de989ac159741d75ecefb5b40de78ffff0e83 100644 (file)
--- a/arch/i386/kernel/cpu/cpufreq/longhaul.c
+++ b/arch/i386/kernel/cpu/cpufreq/longhaul.c
@@ -584,7 +584,7 @@ static int longhaul_cpu_init (struct cpufreq_policy *policy)
        if (ret != 0)
                return ret;
 
-       policy->policy = CPUFREQ_POLICY_PERFORMANCE;
+       policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
        policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
 
        policy->cur = (unsigned int) (longhaul_get_cpu_fsb() * longhaul_get_cpu_mult() * 100);

diff --git a/arch/i386/kernel/cpu/cpufreq/longrun.c b/arch/i386/kernel/cpu/cpufreq/longrun.c
index 2adb51a8d3d4a5142af6022d8ad34682c23c9126..8633cf069d07e8f2b6d2af64331df03f2bd016cf 100644 (file)
--- a/arch/i386/kernel/cpu/cpufreq/longrun.c
+++ b/arch/i386/kernel/cpu/cpufreq/longrun.c
@@ -120,7 +120,8 @@ static int longrun_verify_policy(struct cpufreq_policy *policy)
                policy->cpuinfo.min_freq, 
                policy->cpuinfo.max_freq);
 
-       if (policy->policy == CPUFREQ_POLICY_GOVERNOR)
+       if ((policy->policy != CPUFREQ_POLICY_POWERSAVE) &&
+           (policy->policy != CPUFREQ_POLICY_PERFORMANCE))
                return -EINVAL;
 
        return 0;

diff --git a/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c b/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c
index a1d257e3fa290b109f5652fbecc94878df90e6cd..4bf4fee0d372b851b150d4a3c7efd45e2befeccf 100644 (file)
--- a/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c
+++ b/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c
@@ -211,7 +211,7 @@ static int cpufreq_p4_cpu_init(struct cpufreq_policy *policy)
        cpufreq_frequency_table_get_attr(p4clockmod_table, policy->cpu);
        
        /* cpuinfo and default policy values */
-       policy->policy = CPUFREQ_POLICY_PERFORMANCE;
+       policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
        policy->cpuinfo.transition_latency = 1000;
        policy->cur = stock_freq;
 

diff --git a/arch/i386/kernel/cpu/cpufreq/powernow-k6.c b/arch/i386/kernel/cpu/cpufreq/powernow-k6.c
index 5d967dfe4dbca30b88745d2a1449488cbb1a2e8c..bfb2b6b5468cf56cf599fa1a1edbf4556f5b9162 100644 (file)
--- a/arch/i386/kernel/cpu/cpufreq/powernow-k6.c
+++ b/arch/i386/kernel/cpu/cpufreq/powernow-k6.c
@@ -157,7 +157,7 @@ static int powernow_k6_cpu_init(struct cpufreq_policy *policy)
        }
 
        /* cpuinfo and default policy values */
-       policy->policy = CPUFREQ_POLICY_PERFORMANCE;
+       policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
        policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
        policy->cur = busfreq * max_multiplier;
 

diff --git a/arch/i386/kernel/cpu/cpufreq/powernow-k7.c b/arch/i386/kernel/cpu/cpufreq/powernow-k7.c
index bf923ee095fe43a67ca4d6a88048a7c726abb736..0f577b37c06c2812f2aa26b6c38830662391107c 100644 (file)
--- a/arch/i386/kernel/cpu/cpufreq/powernow-k7.c
+++ b/arch/i386/kernel/cpu/cpufreq/powernow-k7.c
@@ -372,7 +372,7 @@ static int __init powernow_cpu_init (struct cpufreq_policy *policy)
        printk (KERN_INFO PFX "Minimum speed %d MHz. Maximum speed %d MHz.\n",
                                minimum_speed, maximum_speed);
 
-       policy->policy = CPUFREQ_POLICY_PERFORMANCE;
+       policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
        policy->cpuinfo.transition_latency = latency;
        policy->cur = maximum_speed;
 

diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c b/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
index 19c7821cc15c45f6c239b410feda55376a4a86de..2653cc2f3b0ce75ca564b1e868d8ec2dcc9d3358 100644 (file)
--- a/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
+++ b/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
@@ -201,9 +201,7 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
 
        freq = get_cur_freq();
 
-       policy->policy = (freq == centrino_model->max_freq) ? 
-               CPUFREQ_POLICY_PERFORMANCE : 
-               CPUFREQ_POLICY_POWERSAVE;
+       policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
        policy->cpuinfo.transition_latency = 10; /* 10uS transition latency */
        policy->cur = freq;
 

diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-ich.c b/arch/i386/kernel/cpu/cpufreq/speedstep-ich.c
index 500b95d66a7924fa3a5f97191df1883cf8ce9d03..e20b73f4f06f41d0d2e8082e9d7245b84967cb4f 100644 (file)
--- a/arch/i386/kernel/cpu/cpufreq/speedstep-ich.c
+++ b/arch/i386/kernel/cpu/cpufreq/speedstep-ich.c
@@ -299,8 +299,7 @@ static int speedstep_cpu_init(struct cpufreq_policy *policy)
                (speed / 1000));
 
        /* cpuinfo and default policy values */
-       policy->policy = (speed == speedstep_freqs[SPEEDSTEP_LOW].frequency) ? 
-               CPUFREQ_POLICY_POWERSAVE : CPUFREQ_POLICY_PERFORMANCE;
+       policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
        policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
        policy->cur = speed;