--- a/src/hotspot/share/gc/z/zLiveMap.cpp	Mon Nov 25 14:06:13 2019 +0100
+++ b/src/hotspot/share/gc/z/zLiveMap.cpp	Mon Nov 25 12:22:13 2019 +0100
@@ -54,9 +54,9 @@
 
   // Multiple threads can enter here, make sure only one of them
   // resets the marking information while the others busy wait.
-  for (uint32_t seqnum = OrderAccess::load_acquire(&_seqnum);
+  for (uint32_t seqnum = Atomic::load_acquire(&_seqnum);
        seqnum != ZGlobalSeqNum;
-       seqnum = OrderAccess::load_acquire(&_seqnum)) {
+       seqnum = Atomic::load_acquire(&_seqnum)) {
     if ((seqnum != seqnum_initializing) &&
         (Atomic::cmpxchg(seqnum_initializing, &_seqnum, seqnum) == seqnum)) {
       // Reset marking information
@@ -73,7 +73,7 @@
       // before the update of the page seqnum, such that when the
       // up-to-date seqnum is load acquired, the bit maps will not
       // contain stale information.
-      OrderAccess::release_store(&_seqnum, ZGlobalSeqNum);
+      Atomic::release_store(&_seqnum, ZGlobalSeqNum);
       break;
     }