--- a/src/hotspot/share/runtime/vmThread.cpp	Mon Nov 25 14:06:13 2019 +0100
+++ b/src/hotspot/share/runtime/vmThread.cpp	Mon Nov 25 12:22:13 2019 +0100
@@ -203,16 +203,16 @@
 }
 
 bool VMOperationTimeoutTask::is_armed() {
-  return OrderAccess::load_acquire(&_armed) != 0;
+  return Atomic::load_acquire(&_armed) != 0;
 }
 
 void VMOperationTimeoutTask::arm() {
   _arm_time = os::javaTimeMillis();
-  OrderAccess::release_store_fence(&_armed, 1);
+  Atomic::release_store_fence(&_armed, 1);
 }
 
 void VMOperationTimeoutTask::disarm() {
-  OrderAccess::release_store_fence(&_armed, 0);
+  Atomic::release_store_fence(&_armed, 0);
 }
 
 //------------------------------------------------------------------------------------------------------------------