1 files changed, 5 insertions, 1 deletions

diff --git a/arch/i386/kernel/apm.c b/arch/i386/kernel/apm.c
index b75cff25de4b..199016927541 100644
--- a/arch/i386/kernel/apm.c
+++ b/arch/i386/kernel/apm.c
@@ -785,7 +785,11 @@ static int apm_do_idle(void)
         polling = !!(current_thread_info()->status & TS_POLLING);
         if (polling) {
                 current_thread_info()->status &= ~TS_POLLING;
-                smp_mb__after_clear_bit();
+                /*
+                 * TS_POLLING-cleared state must be visible before we
+                 * test NEED_RESCHED:
+                 */
+                smp_mb();
         }
         if (!need_resched()) {
                 idled = 1;