summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/processor_driver.c
diff options
context:
space:
mode:
authorLan Tianyu <tianyu.lan@intel.com>2014-07-31 16:28:50 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-08-06 22:22:03 +0200
commitea9c167d93e6e2f4697f5061756f26356793cd95 (patch)
tree40edef11d556e794c9dda5e31bb37f491d26cd89 /drivers/acpi/processor_driver.c
parentACPI / processor: Make it possible to get local x2apic id via _MAT (diff)
downloadlinux-ea9c167d93e6e2f4697f5061756f26356793cd95.tar.xz
linux-ea9c167d93e6e2f4697f5061756f26356793cd95.zip
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 <tianyu.lan@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/processor_driver.c')
-rw-r--r--drivers/acpi/processor_driver.c1
1 files changed, 1 insertions, 0 deletions
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