diff options
| author | Len Brown <len.brown@intel.com> | 2009-12-16 02:18:36 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-12-16 02:18:36 -0500 |
| commit | 8fa79e08f50f4ec1fd8903eca6fd6f36c36dd4c4 (patch) | |
| tree | 76cd9d4492d7fe4e2a90dbbc43127ca80ad93288 /drivers/acpi/processor_core.c | |
| parent | 7458bbd044f0e799ad27c3fc71e1115ac30a9c25 (diff) | |
| parent | d81c45e1c9369855901420f79114852eba2ea16a (diff) | |
Merge branch 'ost' into release
Conflicts:
include/acpi/processor.h
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/processor_core.c')
| -rw-r--r-- | drivers/acpi/processor_core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index cb4283f5a79d..65b9f29ef10b 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c @@ -722,7 +722,7 @@ static void acpi_processor_notify(struct acpi_device *device, u32 event) switch (event) { case ACPI_PROCESSOR_NOTIFY_PERFORMANCE: saved = pr->performance_platform_limit; - acpi_processor_ppc_has_changed(pr); + acpi_processor_ppc_has_changed(pr, 1); if (saved == pr->performance_platform_limit) break; acpi_bus_generate_proc_event(device, event, @@ -758,7 +758,7 @@ static int acpi_cpu_soft_notify(struct notifier_block *nfb, struct acpi_processor *pr = per_cpu(processors, cpu); if (action == CPU_ONLINE && pr) { - acpi_processor_ppc_has_changed(pr); + acpi_processor_ppc_has_changed(pr, 0); acpi_processor_cst_has_changed(pr); acpi_processor_tstate_has_changed(pr); } @@ -830,7 +830,7 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device) arch_acpi_processor_cleanup_pdc(pr); #ifdef CONFIG_CPU_FREQ - acpi_processor_ppc_has_changed(pr); + acpi_processor_ppc_has_changed(pr, 0); #endif acpi_processor_get_throttling_info(pr); acpi_processor_get_limit_info(pr); |