aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattia Dongili <malattia@linux.it>2006-12-15 13:52:45 -0500
committerDave Jones <davej@redhat.com>2006-12-17 18:09:26 -0500
commita507ac4b01ed379a74eca5060f3553c4a4e5854c (patch)
tree31a86d0e6a6b4d1632ca6c7c6a9bd032cae75761
parent4e581ff165f26ba3d37a4a836b2e3add47bec72f (diff)
[CPUFREQ] set policy->curfreq on initialization
Check the correct variable and set policy->cur upon acpi-cpufreq initialization to allow the userspace governor to be used as default. Signed-off-by: Mattia Dongili <malattia@linux.it> Acked-by: "Pallipadi, Venkatesh" <venkatesh.pallipadi@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dave Jones <davej@redhat.com>
-rw-r--r--arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
index 8e0b995f79ec..b735458c6e3a 100644
--- a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -682,14 +682,14 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
682 if (result) 682 if (result)
683 goto err_freqfree; 683 goto err_freqfree;
684 684
685 switch (data->cpu_feature) { 685 switch (perf->control_register.space_id) {
686 case ACPI_ADR_SPACE_SYSTEM_IO: 686 case ACPI_ADR_SPACE_SYSTEM_IO:
687 /* Current speed is unknown and not detectable by IO port */ 687 /* Current speed is unknown and not detectable by IO port */
688 policy->cur = acpi_cpufreq_guess_freq(data, policy->cpu); 688 policy->cur = acpi_cpufreq_guess_freq(data, policy->cpu);
689 break; 689 break;
690 case ACPI_ADR_SPACE_FIXED_HARDWARE: 690 case ACPI_ADR_SPACE_FIXED_HARDWARE:
691 acpi_cpufreq_driver.get = get_cur_freq_on_cpu; 691 acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
692 get_cur_freq_on_cpu(cpu); 692 policy->cur = get_cur_freq_on_cpu(cpu);
693 break; 693 break;
694 default: 694 default:
695 break; 695 break;