summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2010-02-23 06:39:00 +0100
committerLen Brown <len.brown@intel.com>2010-02-23 06:39:00 +0100
commitb2cb9dcb98cc7a3210e9138a05e0ae1863523a61 (patch)
tree310aeeceaba0c3c7b51aec7a83368e55c6910a68
parentMerge branches 'bugzilla-14207' and 'idle' into release (diff)
parentACPI: Fix regression where _PPC is not read at boot even when ignore_ppc=0 (diff)
downloadlinux-b2cb9dcb98cc7a3210e9138a05e0ae1863523a61.tar.xz
linux-b2cb9dcb98cc7a3210e9138a05e0ae1863523a61.zip
Merge branch 'pcc' into release
-rw-r--r--drivers/acpi/processor_perflib.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c
index 2cabadcc4d8c..a959f6a07508 100644
--- a/drivers/acpi/processor_perflib.c
+++ b/drivers/acpi/processor_perflib.c
@@ -413,7 +413,11 @@ static int acpi_processor_get_performance_info(struct acpi_processor *pr)
if (result)
goto update_bios;
- return 0;
+ /* We need to call _PPC once when cpufreq starts */
+ if (ignore_ppc != 1)
+ result = acpi_processor_get_platform_limit(pr);
+
+ return result;
/*
* Having _PPC but missing frequencies (_PSS, _PCT) is a very good hint that