--- a/src/hotspot/cpu/zero/cppInterpreter_zero.cpp	Mon Apr 09 08:19:26 2018 -0400
+++ b/src/hotspot/cpu/zero/cppInterpreter_zero.cpp	Thu Apr 05 10:54:53 2018 +0200
@@ -275,7 +275,7 @@
     markOop disp = lockee->mark()->set_unlocked();
 
     monitor->lock()->set_displaced_header(disp);
-    if (Atomic::cmpxchg((markOop)monitor, lockee->mark_addr(), disp) != disp) {
+    if (lockee->cas_set_mark((markOop)monitor, disp) != disp) {
       if (thread->is_lock_owned((address) disp->clear_lock_bits())) {
         monitor->lock()->set_displaced_header(NULL);
       }