Commit 8dbb8d54fe0bb551d515393fca495508d36af2a1

Authored by Rafael J. Wysocki

Merge branch 'acpi-processor'

* acpi-processor:
  ACPI / processor: Do not request ACPI cpufreq module directly

Showing 3 changed files Side-by-side Diff

drivers/acpi/processor_driver.c
... ... @@ -171,7 +171,6 @@
171 171  
172 172 #ifdef CONFIG_CPU_FREQ
173 173 acpi_processor_ppc_has_changed(pr, 0);
174   - acpi_processor_load_module(pr);
175 174 #endif
176 175 acpi_processor_get_throttling_info(pr);
177 176  
drivers/acpi/processor_perflib.c
... ... @@ -235,28 +235,6 @@
235 235 acpi_processor_ppc_status &= ~PPC_REGISTERED;
236 236 }
237 237  
238   -/*
239   - * Do a quick check if the systems looks like it should use ACPI
240   - * cpufreq. We look at a _PCT method being available, but don't
241   - * do a whole lot of sanity checks.
242   - */
243   -void acpi_processor_load_module(struct acpi_processor *pr)
244   -{
245   - static int requested;
246   - acpi_status status = 0;
247   - struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
248   -
249   - if (!arch_has_acpi_pdc() || requested)
250   - return;
251   - status = acpi_evaluate_object(pr->handle, "_PCT", NULL, &buffer);
252   - if (!ACPI_FAILURE(status)) {
253   - printk(KERN_INFO PREFIX "Requesting acpi_cpufreq\n");
254   - request_module_nowait("acpi_cpufreq");
255   - requested = 1;
256   - }
257   - kfree(buffer.pointer);
258   -}
259   -
260 238 static int acpi_processor_get_performance_control(struct acpi_processor *pr)
261 239 {
262 240 int result = 0;
include/acpi/processor.h
... ... @@ -225,7 +225,6 @@
225 225 } piix4;
226 226 };
227 227  
228   -extern void acpi_processor_load_module(struct acpi_processor *pr);
229 228 extern int acpi_processor_preregister_performance(struct
230 229 acpi_processor_performance
231 230 __percpu *performance);