diff options
| author | Len Brown <len.brown@intel.com> | 2012-04-06 21:48:59 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2012-04-06 21:48:59 -0400 |
| commit | eeaab2d8af2cf1d36d7086f22e9de42d6dd2995c (patch) | |
| tree | 369b9c91a6d808944f07d2290fec6f9fe2731904 /drivers/acpi/processor_idle.c | |
| parent | ee01e663373343c63e0e3d364d09f6155378dbcc (diff) | |
| parent | aaef292acf3a78d9c0bb6fb72226077d286b45d7 (diff) | |
Merge branches 'idle-fix' and 'misc' into release
Diffstat (limited to 'drivers/acpi/processor_idle.c')
| -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 784f9a7beb17..f3decb30223f 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c | |||
| @@ -1190,8 +1190,7 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr) | |||
| 1190 | * to make the code that updates C-States be called once. | 1190 | * to make the code that updates C-States be called once. |
| 1191 | */ | 1191 | */ |
| 1192 | 1192 | ||
| 1193 | if (smp_processor_id() == 0 && | 1193 | if (pr->id == 0 && cpuidle_get_driver() == &acpi_idle_driver) { |
| 1194 | cpuidle_get_driver() == &acpi_idle_driver) { | ||
| 1195 | 1194 | ||
| 1196 | cpuidle_pause_and_lock(); | 1195 | cpuidle_pause_and_lock(); |
| 1197 | /* Protect against cpu-hotplug */ | 1196 | /* Protect against cpu-hotplug */ |