diff options
author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2012-02-28 16:27:44 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2012-03-30 03:58:06 -0400 |
commit | 9505626d7bfeb5bd4b85acb483831ac640b2a5e8 (patch) | |
tree | 70e19eeda29ed3c98b628381eed2a3ce75ee398f /drivers/acpi | |
parent | e252675fb722d4a307cc380a06a905f03cf9951c (diff) |
ACPI: Fix unprotected smp_processor_id() in acpi_processor_cst_has_changed()
The acpi_processor_cst_has_changed() function is invoked from a
CPU_ONLINE or CPU_DEAD function, which might well execute on CPU 0
even though the CPU being hotplugged is some other CPU. In addition,
acpi_processor_cst_has_changed() invokes smp_processor_id() without
protection, resulting in splats when onlining CPUs.
This commit therefore changes the smp_processor_id() to pr->id, as is
used elsewhere in the code, for example, in acpi_processor_add().
Signed-off-by: Paul E. McKenney <paul.mckenney@linaro.org>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Tested-by: Yong Zhang <yong.zhang0@gmail.com>
Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/processor_idle.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 0e8e2de2ed3e..9e57b06d1f24 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c | |||
@@ -1159,8 +1159,7 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr) | |||
1159 | * to make the code that updates C-States be called once. | 1159 | * to make the code that updates C-States be called once. |
1160 | */ | 1160 | */ |
1161 | 1161 | ||
1162 | if (smp_processor_id() == 0 && | 1162 | if (pr->id == 0 && cpuidle_get_driver() == &acpi_idle_driver) { |
1163 | cpuidle_get_driver() == &acpi_idle_driver) { | ||
1164 | 1163 | ||
1165 | cpuidle_pause_and_lock(); | 1164 | cpuidle_pause_and_lock(); |
1166 | /* Protect against cpu-hotplug */ | 1165 | /* Protect against cpu-hotplug */ |