From ea9c167d93e6e2f4697f5061756f26356793cd95 Mon Sep 17 00:00:00 2001 From: Lan Tianyu Date: Thu, 31 Jul 2014 22:28:50 +0800 Subject: [PATCH] ACPI / processor: Make acpi_cpu_soft_notify() process CPU FROZEN events CPU hotplug happens during S2RAM and CPU notify event will be CPU_XXX_FROZEN. acpi_cpu_soft_notify() ignores to check these events. This also may make acpi_cpu_soft_notify() fall into sleep during CPU_DYING/STARTING_FROZEN events which don't allow callbacks to sleep. This patch is to fix it. Signed-off-by: Lan Tianyu Signed-off-by: Rafael J. Wysocki --- drivers/acpi/processor_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c index 4fcbd670415c..d9f71581b79b 100644 --- a/drivers/acpi/processor_driver.c +++ b/drivers/acpi/processor_driver.c @@ -120,6 +120,7 @@ static int acpi_cpu_soft_notify(struct notifier_block *nfb, unsigned int cpu = (unsigned long)hcpu; struct acpi_processor *pr = per_cpu(processors, cpu); struct acpi_device *device; + action &= ~CPU_TASKS_FROZEN; /* * CPU_STARTING and CPU_DYING must not sleep. Return here since