From: Richard Cochran <[email protected]>
As part of the hotplug cleanup, the CPU_STARTING/DYING actions are going
away soon. This driver needlessly uses those two macro, and so this patch
replaces that code with something more sensible.
Commit 8da8373447d6a57a5a9f55233d35beb15d92d0d2 ("ACPI / processor: Fix
STARTING/DYING action in acpi_cpu_soft_notify()") added checks for those
two actions, because the notification callback can sleep, causing a hung
CPU. This patch instead checks for the ONLINE/DEAD actions, which are the
ones that are handled by the driver in the first place.
Signed-off-by: Richard Cochran <[email protected]>
Reviewed-by: Sebastian Andrzej Siewior <[email protected]>
Cc: "Rafael J. Wysocki" <[email protected]>
Cc: Len Brown <[email protected]>
Cc: [email protected]
Signed-off-by: Anna-Maria Gleixner <[email protected]>
---
drivers/acpi/processor_driver.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
@@ -118,12 +118,13 @@ static int acpi_cpu_soft_notify(struct n
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;
