summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/processor_driver.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-08-27 01:29:24 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-08-27 01:29:24 +0200
commit551f5c74e17ba9257cdc35bf657ee448cad2d5b0 (patch)
treef4e4ca5f0624c75dbf285ada81bd564e51b8955e /drivers/acpi/processor_driver.c
parent8462d9df9d5033da4d25e59016b1e7a9d94a1f22 (diff)
parentb9d10be7a8e88fdcb12540387c219cdde87b0795 (diff)
downloadlinux-551f5c74e17ba9257cdc35bf657ee448cad2d5b0.tar.gz
linux-551f5c74e17ba9257cdc35bf657ee448cad2d5b0.tar.bz2
linux-551f5c74e17ba9257cdc35bf657ee448cad2d5b0.zip
Merge branch 'acpi-processor'
* acpi-processor: ACPI / processor: Acquire writer lock to update CPU maps ACPI / processor: Remove acpi_processor_get_limit_info()
Diffstat (limited to 'drivers/acpi/processor_driver.c')
-rw-r--r--drivers/acpi/processor_driver.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
index bd11ef93b0ce..e534ba66d5b8 100644
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
@@ -175,7 +175,9 @@ static int __acpi_processor_start(struct acpi_device *device)
acpi_processor_load_module(pr);
#endif
acpi_processor_get_throttling_info(pr);
- acpi_processor_get_limit_info(pr);
+
+ if (pr->flags.throttling)
+ pr->flags.limit = 1;
if (!cpuidle_get_driver() || cpuidle_get_driver() == &acpi_idle_driver)
acpi_processor_power_init(pr);