1 files changed, 23 insertions, 14 deletions

diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 161db4acfb91..573b6a97bb1f 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -167,6 +167,19 @@ acpi_processor_power_activate(struct acpi_processor *pr,
         return;
 }
 
+static void acpi_safe_halt(void)
+{
+        int polling = test_thread_flag(TIF_POLLING_NRFLAG);
+        if (polling) {
+                clear_thread_flag(TIF_POLLING_NRFLAG);
+                smp_mb__after_clear_bit();
+        }
+        if (!need_resched())
+                safe_halt();
+        if (polling)
+                set_thread_flag(TIF_POLLING_NRFLAG);
+}
+
 static atomic_t c3_cpu_count;
 
 static void acpi_processor_idle(void)
@@ -177,7 +190,7 @@ static void acpi_processor_idle(void)
         int sleep_ticks = 0;
         u32 t1, t2 = 0;
 
-        pr = processors[raw_smp_processor_id()];
+        pr = processors[smp_processor_id()];
         if (!pr)
                 return;
 
@@ -197,8 +210,13 @@ static void acpi_processor_idle(void)
         }
 
         cx = pr->power.state;
-        if (!cx)
-                goto easy_out;
+        if (!cx) {
+                if (pm_idle_save)
+                        pm_idle_save();
+                else
+                        acpi_safe_halt();
+                return;
+        }
 
         /*
          * Check BM Activity
@@ -278,7 +296,8 @@ static void acpi_processor_idle(void)
                 if (pm_idle_save)
                         pm_idle_save();
                 else
-                        safe_halt();
+                        acpi_safe_halt();
+
                 /*
                  * TBD: Can't get time duration while in C1, as resumes
                  *      go to an ISR rather than here.  Need to instrument
@@ -414,16 +433,6 @@ static void acpi_processor_idle(void)
          */
         if (next_state != pr->power.state)
                 acpi_processor_power_activate(pr, next_state);
-
-        return;
-
-      easy_out:
-        /* do C1 instead of busy loop */
-        if (pm_idle_save)
-                pm_idle_save();
-        else
-                safe_halt();
-        return;
 }
 
 static int acpi_processor_set_power_policy(struct acpi_processor *pr)