Pull 5165 into release branch

1 files changed, 15 insertions, 5 deletions

diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 5f51057518b0..807b0df308f1 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -274,8 +274,6 @@ static void acpi_processor_idle(void)
                 }
         }
 
-        cx->usage++;
-
 #ifdef CONFIG_HOTPLUG_CPU
         /*
          * Check for P_LVL2_UP flag before entering C2 and above on
@@ -283,9 +281,12 @@ static void acpi_processor_idle(void)
          * detection phase, to work cleanly with logical CPU hotplug.
          */
         if ((cx->type != ACPI_STATE_C1) && (num_online_cpus() > 1) && 
-            !pr->flags.has_cst && acpi_fadt.plvl2_up)
-                cx->type = ACPI_STATE_C1;
+            !pr->flags.has_cst && !acpi_fadt.plvl2_up)
+                cx = &pr->power.states[ACPI_STATE_C1];
 #endif
+
+        cx->usage++;
+
         /*
          * Sleep:
          * ------
@@ -386,6 +387,15 @@ static void acpi_processor_idle(void)
 
         next_state = pr->power.state;
 
+#ifdef CONFIG_HOTPLUG_CPU
+        /* Don't do promotion/demotion */
+        if ((cx->type == ACPI_STATE_C1) && (num_online_cpus() > 1) &&
+            !pr->flags.has_cst && !acpi_fadt.plvl2_up) {
+                next_state = cx;
+                goto end;
+        }
+#endif
+
         /*
          * Promotion?
          * ----------
@@ -557,7 +567,7 @@ static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr)
          * Check for P_LVL2_UP flag before entering C2 and above on
          * an SMP system. 
          */
-        if ((num_online_cpus() > 1) && acpi_fadt.plvl2_up)
+        if ((num_online_cpus() > 1) && !acpi_fadt.plvl2_up)
                 return_VALUE(-ENODEV);
 #endif