mirror of
https://github.com/torvalds/linux.git
synced 2025-08-15 14:11:42 +02:00
Merge branches 'acpi-ec' and 'acpi-processor'
* acpi-ec: ACPI: EC: Relax sanity check of the ECDT ID string * acpi-processor: ACPI: processor: perflib: Move problematic pr->performance check
This commit is contained in:
commit
40f2f1aa62
1 changed files with 4 additions and 1 deletions
|
@ -180,7 +180,7 @@ void acpi_processor_ppc_init(struct cpufreq_policy *policy)
|
||||||
struct acpi_processor *pr = per_cpu(processors, cpu);
|
struct acpi_processor *pr = per_cpu(processors, cpu);
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
if (!pr || !pr->performance)
|
if (!pr)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -197,6 +197,9 @@ void acpi_processor_ppc_init(struct cpufreq_policy *policy)
|
||||||
pr_err("Failed to add freq constraint for CPU%d (%d)\n",
|
pr_err("Failed to add freq constraint for CPU%d (%d)\n",
|
||||||
cpu, ret);
|
cpu, ret);
|
||||||
|
|
||||||
|
if (!pr->performance)
|
||||||
|
continue;
|
||||||
|
|
||||||
ret = acpi_processor_get_platform_limit(pr);
|
ret = acpi_processor_get_platform_limit(pr);
|
||||||
if (ret)
|
if (ret)
|
||||||
pr_err("Failed to update freq constraint for CPU%d (%d)\n",
|
pr_err("Failed to update freq constraint for CPU%d (%d)\n",
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue