ACPI / processor: Do not request ACPI cpufreq module directly
Function acpi_processor_load_module() used by the ACPI processor driver can only really work if the acpi-cpufreq module is available when acpi_processor_start() is executed which usually is not the case for systems loading the processor driver module from an initramfs. Moreover, that used to be a hackish workaround for module autoloading issues, but udev loads acpi-cpufreq just fine nowadays, so that function isn't really necessary any more. For this reason, drop acpi_processor_load_module() entirely. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Родитель
764d022133
Коммит
34411a69a4
|
@ -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);
|
||||||
|
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче