Exit ACPI processor module gracefully if acpi is disabled
PATCH 1/8 Exit ACPI processor module gracefully if acpi is disabled
From: Thomas Renninger <[email protected]>
akpm: needs a changelog
Signed-off-by Thomas Renninger <[email protected]>
Cc Len Brown <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
drivers/acpi/processor_core.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
drivers/acpi/processor_core.c renamed from drivers/acpi/processor_core.c~exit-acpi-processor-module-gracefully-if-acpi-is-disabled +10 -9
@@ -1030,6 +1030,8 @@ void acpi_processor_uninstall_hotplug_no* ACPI, but needs symbols from this driver */ +static int processor_driver_registered; +static int __init acpi_processor_init (void ) {int result =0 ;
@@ -1055,6 +1057,8 @@ static int __init acpi_processor_init(voreturn result; } + processor_driver_registered =1 ; +acpi_processor_install_hotplug_notify ();acpi_thermal_cpufreq_init ();
@@ -1068,15 +1072,12 @@ static void __exit acpi_processor_exit(v {acpi_processor_ppc_exit (); - -acpi_thermal_cpufreq_exit (); - -acpi_processor_uninstall_hotplug_notify (); - -acpi_bus_unregister_driver (&acpi_processor_driver); - -remove_proc_entry (ACPI_PROCESSOR_CLASS , acpi_root_dir); - +if (processor_driver_registered) { +acpi_thermal_cpufreq_exit (); +acpi_processor_uninstall_hotplug_notify (); +acpi_bus_unregister_driver (&acpi_processor_driver); +remove_proc_entry (ACPI_PROCESSOR_CLASS , acpi_root_dir); + }return ; }
_