Merge "Expect spurious wake-up from futex(2)/FUTEX_WAIT call."

1 files changed, 1 insertions, 5 deletions

diff --git a/runtime/thread_list.cc b/runtime/thread_list.cc
index 97bcb7d406..16ef0fff22 100644
--- a/runtime/thread_list.cc
+++ b/runtime/thread_list.cc
@@ -613,11 +613,7 @@ void ThreadList::SuspendAllInternal(Thread* self,
             PLOG(FATAL) << "futex wait failed for SuspendAllInternal()";
           }
         }
-      } else {
-        cur_val = pending_threads.LoadRelaxed();
-        CHECK_EQ(cur_val, 0);
-        break;
-      }
+      }  // else re-check pending_threads in the next iteration (this may be a spurious wake-up).
 #else
       // Spin wait. This is likely to be slow, but on most architecture ART_USE_FUTEXES is set.
 #endif