Message ID | 200908062216.n76MGXY8019375@imap1.linux-foundation.org (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
diff -puN drivers/acpi/processor_core.c~acpi-dont-call-acpi_processor_init-if-acpi-is-disabled drivers/acpi/processor_core.c --- a/drivers/acpi/processor_core.c~acpi-dont-call-acpi_processor_init-if-acpi-is-disabled +++ a/drivers/acpi/processor_core.c @@ -1137,6 +1137,9 @@ static int __init acpi_processor_init(vo { int result = 0; + if (acpi_disabled) + return 0; + memset(&errata, 0, sizeof(errata)); #ifdef CONFIG_SMP @@ -1185,6 +1188,9 @@ out_proc: static void __exit acpi_processor_exit(void) { + if (acpi_disabled) + return; + acpi_processor_ppc_exit(); acpi_thermal_cpufreq_exit();