diff options
| author | Lan Tianyu <tianyu.lan@intel.com> | 2014-07-31 22:28:50 +0800 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-08-06 22:22:03 +0200 |
| commit | ea9c167d93e6e2f4697f5061756f26356793cd95 (patch) | |
| tree | 40edef11d556e794c9dda5e31bb37f491d26cd89 | |
| parent | 515afdcba0880528fa8ae6fa63a14de6b9018770 (diff) | |
| download | linux-ea9c167d93e6e2f4697f5061756f26356793cd95.tar.bz2 | |
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>
| -rw-r--r-- | drivers/acpi/processor_driver.c | 1 |
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 |