Commit defa0c6b authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

Merge branch 'acpi-processor' to satisfy dependencies

parents 30c76882 bca3e43c
......@@ -511,7 +511,7 @@ int acpi_get_psd_map(struct cppc_cpudata **all_cpu_data)
/* 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);
......
......@@ -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 @@ int acpi_processor_preregister_performance(
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 */
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment