From: Thomas Renninger akpm: where's the changelog?? Signed-off-by: Thomas Renninger Cc: Len Brown Signed-off-by: Andrew Morton --- drivers/acpi/processor_core.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff -puN drivers/acpi/processor_core.c~exit-acpi-processor-module-gracefully-if-acpi-is-disabled drivers/acpi/processor_core.c --- a/drivers/acpi/processor_core.c~exit-acpi-processor-module-gracefully-if-acpi-is-disabled +++ a/drivers/acpi/processor_core.c @@ -1008,6 +1008,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; @@ -1035,6 +1037,8 @@ static int __init acpi_processor_init(vo if (result < 0) goto out_cpuidle; + processor_driver_registered = 1; + acpi_processor_install_hotplug_notify(); acpi_thermal_cpufreq_init(); @@ -1056,16 +1060,13 @@ 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); - - cpuidle_unregister_driver(&acpi_idle_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); + cpuidle_unregister_driver(&acpi_idle_driver); + remove_proc_entry(ACPI_PROCESSOR_CLASS, acpi_root_dir); + } return; } _