Merge branch 'acpi-processor'

Merge topic branch depended on by the following material.
This commit is contained in:
Rafael J. Wysocki
2021-03-08 19:10:07 +01:00

View File

@ -63,14 +63,15 @@ static int acpi_processor_get_platform_limit(struct acpi_processor *pr)
* (e.g. 0 = states 0..n; 1 = states 1..n; etc. * (e.g. 0 = states 0..n; 1 = states 1..n; etc.
*/ */
status = acpi_evaluate_integer(pr->handle, "_PPC", NULL, &ppc); status = acpi_evaluate_integer(pr->handle, "_PPC", NULL, &ppc);
if (status != AE_NOT_FOUND) {
if (status != AE_NOT_FOUND)
acpi_processor_ppc_in_use = true; acpi_processor_ppc_in_use = true;
if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) { if (ACPI_FAILURE(status)) {
acpi_handle_warn(pr->handle, "_PPC evaluation failed: %s\n", acpi_handle_warn(pr->handle,
acpi_format_exception(status)); "_PPC evaluation failed: %s\n",
return -ENODEV; acpi_format_exception(status));
return -ENODEV;
}
} }
pr_debug("CPU %d: _PPC is %d - frequency %s limited\n", pr->id, pr_debug("CPU %d: _PPC is %d - frequency %s limited\n", pr->id,