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

Merge branch 'acpi-hotplug' 

* acpi-hotplug:
  ACPI / processor: Drop unused variable from processor_perflib.c
  ACPI / processor: Remove unused macros in processor_driver.c
parents e52cff8b 09d5ca80

drivers/acpi/processor_driver.c

+0 −6
Original line number Diff line number Diff line
@@ -43,16 +43,10 @@ 


#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_POWER	0x81

#define ACPI_PROCESSOR_NOTIFY_THROTTLING	0x82



#define ACPI_PROCESSOR_LIMIT_USER	0

#define ACPI_PROCESSOR_LIMIT_THERMAL	1



#define _COMPONENT		ACPI_PROCESSOR_COMPONENT

ACPI_MODULE_NAME("processor_driver");

drivers/acpi/processor_perflib.c

+1 −3
Original line number Diff line number Diff line
@@ -639,7 +639,7 @@ static int acpi_processor_get_psd(struct acpi_processor *pr) 
int acpi_processor_preregister_performance(

		struct acpi_processor_performance __percpu *performance)

{

	int count, count_target;

	int count_target;

	int retval = 0;

	unsigned int i, j;

	cpumask_var_t covered_cpus;
@@ -711,7 +711,6 @@ int acpi_processor_preregister_performance( 


		/* Validate the Domain info */

		count_target = pdomain->num_processors;

		count = 1;

		if (pdomain->coord_type == DOMAIN_COORD_TYPE_SW_ALL)

			pr->performance->shared_type = CPUFREQ_SHARED_TYPE_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, pr->performance->shared_cpu_map);

			count++;

		}



		for_each_possible_cpu(j) {