Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / drivers / acpi / processor_driver.c

diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
index 0ca14ac..0553aee 100644 (file)
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
@@ -118,12 +118,13 @@ static int acpi_cpu_soft_notify(struct notifier_block *nfb,
        struct acpi_device *device;
        action &= ~CPU_TASKS_FROZEN;
 
-       /*
-        * CPU_STARTING and CPU_DYING must not sleep. Return here since
-        * acpi_bus_get_device() may sleep.
-        */
-       if (action == CPU_STARTING || action == CPU_DYING)
+       switch (action) {
+       case CPU_ONLINE:
+       case CPU_DEAD:
+               break;
+       default:
                return NOTIFY_DONE;
+       }
 
        if (!pr || acpi_bus_get_device(pr->handle, &device))
                return NOTIFY_DONE;