Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'acpi-processor' 

* acpi-processor:
  ACPI / processor: Do not request ACPI cpufreq module directly
parents 93658cb8 34411a69

drivers/acpi/processor_driver.c

+0 −1
Original line number Diff line number Diff line
@@ -171,7 +171,6 @@ static int __acpi_processor_start(struct acpi_device *device) 


#ifdef CONFIG_CPU_FREQ

	acpi_processor_ppc_has_changed(pr, 0);

	acpi_processor_load_module(pr);

#endif

	acpi_processor_get_throttling_info(pr);

drivers/acpi/processor_perflib.c

+0 −22
Original line number Diff line number Diff line
@@ -235,28 +235,6 @@ void acpi_processor_ppc_exit(void) 
	acpi_processor_ppc_status &= ~PPC_REGISTERED;

}



/*

 * Do a quick check if the systems looks like it should use ACPI

 * cpufreq. We look at a _PCT method being available, but don't

 * do a whole lot of sanity checks.

 */

void acpi_processor_load_module(struct acpi_processor *pr)

{

	static int requested;

	acpi_status status = 0;

	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };



	if (!arch_has_acpi_pdc() || requested)

		return;

	status = acpi_evaluate_object(pr->handle, "_PCT", NULL, &buffer);

	if (!ACPI_FAILURE(status)) {

		printk(KERN_INFO PREFIX "Requesting acpi_cpufreq\n");

		request_module_nowait("acpi_cpufreq");

		requested = 1;

	}

	kfree(buffer.pointer);

}



static int acpi_processor_get_performance_control(struct acpi_processor *pr)

{

	int result = 0;

include/acpi/processor.h

+0 −1
Original line number Diff line number Diff line
@@ -225,7 +225,6 @@ struct acpi_processor_errata { 
	} piix4;

};



extern void acpi_processor_load_module(struct acpi_processor *pr);

extern int acpi_processor_preregister_performance(struct

						  acpi_processor_performance

						  __percpu *performance);