Merge branch 'acpi-hotplug' (996e2569) · Commits · 戴 / test

drivers/acpi/processor_driver.c

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -43,16 +43,10 @@

	#define PREFIX "ACPI: "		#define PREFIX "ACPI: "

	#define ACPI_PROCESSOR_FILE_INFO "info"
	#define ACPI_PROCESSOR_FILE_THROTTLING "throttling"
	#define ACPI_PROCESSOR_FILE_LIMIT "limit"
	#define ACPI_PROCESSOR_NOTIFY_PERFORMANCE 0x80		#define ACPI_PROCESSOR_NOTIFY_PERFORMANCE 0x80
	#define ACPI_PROCESSOR_NOTIFY_POWER 0x81		#define ACPI_PROCESSOR_NOTIFY_POWER 0x81
	#define ACPI_PROCESSOR_NOTIFY_THROTTLING 0x82		#define ACPI_PROCESSOR_NOTIFY_THROTTLING 0x82

	#define ACPI_PROCESSOR_LIMIT_USER 0
	#define ACPI_PROCESSOR_LIMIT_THERMAL 1

	#define _COMPONENT ACPI_PROCESSOR_COMPONENT		#define _COMPONENT ACPI_PROCESSOR_COMPONENT
	ACPI_MODULE_NAME("processor_driver");		ACPI_MODULE_NAME("processor_driver");

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -639,7 +639,7 @@ end:
	int acpi_processor_preregister_performance(		int acpi_processor_preregister_performance(
	struct acpi_processor_performance __percpu *performance)		struct acpi_processor_performance __percpu *performance)
	{		{
	int count, count_target;		int count_target;
	int retval = 0;		int retval = 0;
	unsigned int i, j;		unsigned int i, j;
	cpumask_var_t covered_cpus;		cpumask_var_t covered_cpus;
	@@ -711,7 +711,6 @@ int acpi_processor_preregister_performance(

	/* Validate the Domain info */		/* Validate the Domain info */
	count_target = pdomain->num_processors;		count_target = pdomain->num_processors;
	count = 1;
	if (pdomain->coord_type == DOMAIN_COORD_TYPE_SW_ALL)		if (pdomain->coord_type == DOMAIN_COORD_TYPE_SW_ALL)
	pr->performance->shared_type = CPUFREQ_SHARED_TYPE_ALL;		pr->performance->shared_type = CPUFREQ_SHARED_TYPE_ALL;
	else if (pdomain->coord_type == DOMAIN_COORD_TYPE_HW_ALL)		else if (pdomain->coord_type == DOMAIN_COORD_TYPE_HW_ALL)
	@@ -745,7 +744,6 @@ int acpi_processor_preregister_performance(

	cpumask_set_cpu(j, covered_cpus);		cpumask_set_cpu(j, covered_cpus);
	cpumask_set_cpu(j, pr->performance->shared_cpu_map);		cpumask_set_cpu(j, pr->performance->shared_cpu_map);
	count++;
	}		}

	for_each_possible_cpu(j) {		for_each_possible_cpu(j) {