evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'acpi-processor'

Browse source 
* acpi-processor:
  ACPI / processor: Do not request ACPI cpufreq module directly
This commit is contained in:
Rafael J. Wysocki 2013-11-07 19:18:27 +01:00
commit 8dbb8d54fe
3 changed files with 0 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/acpi/processor_driver.c
View file

@ -171,7 +171,6 @@ static int __acpi_processor_start(struct acpi_device *device)
#ifdef CONFIG_CPU_FREQ #ifdef CONFIG_CPU_FREQ
acpi_processor_ppc_has_changed(pr, 0); acpi_processor_ppc_has_changed(pr, 0);
acpi_processor_load_module(pr);
#endif #endif
acpi_processor_get_throttling_info(pr); acpi_processor_get_throttling_info(pr);

22
drivers/acpi/processor_perflib.c
View file

@ -235,28 +235,6 @@ void acpi_processor_ppc_exit(void)
acpi_processor_ppc_status &= ~PPC_REGISTERED; 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) static int acpi_processor_get_performance_control(struct acpi_processor *pr)
{ {
int result = 0; int result = 0;

1
include/acpi/processor.h
View file

@ -225,7 +225,6 @@ struct acpi_processor_errata {
} piix4; } piix4;
}; };
extern void acpi_processor_load_module(struct acpi_processor *pr);
extern int acpi_processor_preregister_performance(struct extern int acpi_processor_preregister_performance(struct
acpi_processor_performance acpi_processor_performance
__percpu *performance); __percpu *performance);