|
@@ -121,6 +121,13 @@ static int acpi_cpu_soft_notify(struct notifier_block *nfb,
|
|
struct acpi_processor *pr = per_cpu(processors, cpu);
|
|
struct acpi_processor *pr = per_cpu(processors, cpu);
|
|
struct acpi_device *device;
|
|
struct acpi_device *device;
|
|
|
|
|
|
|
|
+ /*
|
|
|
|
+ * CPU_STARTING and CPU_DYING must not sleep. Return here since
|
|
|
|
+ * acpi_bus_get_device() may sleep.
|
|
|
|
+ */
|
|
|
|
+ if (action == CPU_STARTING || action == CPU_DYING)
|
|
|
|
+ return NOTIFY_DONE;
|
|
|
|
+
|
|
if (!pr || acpi_bus_get_device(pr->handle, &device))
|
|
if (!pr || acpi_bus_get_device(pr->handle, &device))
|
|
return NOTIFY_DONE;
|
|
return NOTIFY_DONE;
|
|
|
|
|