diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-12-15 19:19:07 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-12-15 19:19:07 +0100 |
| commit | defa0c6b94db6156c0e2c97e4cedf7986b24730a (patch) | |
| tree | cd29651c0de271ee046752b06e830cf7b9e5c82e | |
| parent | 30c768829af2574a2f60ca85c4cc3ba2ed8d0e58 (diff) | |
| parent | bca3e43c903f5c58daeab1fea0af566233ea003c (diff) | |
| download | linux-defa0c6b94db6156c0e2c97e4cedf7986b24730a.tar.gz linux-defa0c6b94db6156c0e2c97e4cedf7986b24730a.tar.bz2 linux-defa0c6b94db6156c0e2c97e4cedf7986b24730a.zip | |
Merge branch 'acpi-processor' to satisfy dependencies
| -rw-r--r-- | drivers/acpi/cppc_acpi.c | 2 | ||||
| -rw-r--r-- | drivers/acpi/processor_perflib.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/acpi/cppc_acpi.c b/drivers/acpi/cppc_acpi.c index 7a99b19bb893..9e335f0d2595 100644 --- a/drivers/acpi/cppc_acpi.c +++ b/drivers/acpi/cppc_acpi.c @@ -511,7 +511,7 @@ err_ret: /* Assume no coordination on any error parsing domain info */ cpumask_clear(pr->shared_cpu_map); cpumask_set_cpu(i, pr->shared_cpu_map); - pr->shared_type = CPUFREQ_SHARED_TYPE_ALL; + pr->shared_type = CPUFREQ_SHARED_TYPE_NONE; } out: free_cpumask_var(covered_cpus); diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c index b04a68950ff1..1338925c9359 100644 --- a/drivers/acpi/processor_perflib.c +++ b/drivers/acpi/processor_perflib.c @@ -616,7 +616,6 @@ int acpi_processor_preregister_performance( continue; pr->performance = per_cpu_ptr(performance, i); - cpumask_set_cpu(i, pr->performance->shared_cpu_map); pdomain = &(pr->performance->domain_info); if (acpi_processor_get_psd(pr->handle, pdomain)) { retval = -EINVAL; @@ -710,7 +709,7 @@ err_ret: if (retval) { cpumask_clear(pr->performance->shared_cpu_map); cpumask_set_cpu(i, pr->performance->shared_cpu_map); - pr->performance->shared_type = CPUFREQ_SHARED_TYPE_ALL; + pr->performance->shared_type = CPUFREQ_SHARED_TYPE_NONE; } pr->performance = NULL; /* Will be set for real in register */ } |