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

Merge branch 'acpi-processor' to satisfy dependencies

parents 30c76882 bca3e43c

drivers/acpi/cppc_acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/acpi/processor_perflib.c

+1 −2
Original line number Diff line number Diff line
@@ -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 */

	}