Merge branches 'idle-fix' and 'misc' into release

This commit is contained in:
Len Brown
2012-04-06 21:48:59 -04:00
10325 changed files with 497504 additions and 288659 deletions

View File

@@ -1190,8 +1190,7 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr)
* to make the code that updates C-States be called once.
*/
if (smp_processor_id() == 0 &&
cpuidle_get_driver() == &acpi_idle_driver) {
if (pr->id == 0 && cpuidle_get_driver() == &acpi_idle_driver) {
cpuidle_pause_and_lock();
/* Protect against cpu-hotplug */