diff -r a8dcacf95bff -r 1126f0607c70 src/hotspot/share/runtime/vmOperations.cpp
--- a/src/hotspot/share/runtime/vmOperations.cpp	Thu Apr 25 05:54:54 2019 -0700
+++ b/src/hotspot/share/runtime/vmOperations.cpp	Thu Apr 25 10:56:31 2019 -0400
@@ -450,8 +450,8 @@
 
     attempts++;
 
-    MutexLockerEx ml(&timer, Mutex::_no_safepoint_check_flag);
-    timer.wait(Mutex::_no_safepoint_check_flag, 10);
+    MutexLocker ml(&timer, Mutex::_no_safepoint_check_flag);
+    timer.wait_without_safepoint_check(10);
   }
 }