--- a/src/hotspot/share/gc/g1/g1HotCardCache.cpp	Mon Oct 16 20:22:41 2017 +0000
+++ b/src/hotspot/share/gc/g1/g1HotCardCache.cpp	Mon Oct 16 22:36:06 2017 -0400
@@ -74,9 +74,9 @@
   // card_ptr in favor of the other option, which would be starting over. This
   // should be OK since card_ptr will likely be the older card already when/if
   // this ever happens.
-  jbyte* previous_ptr = (jbyte*)Atomic::cmpxchg_ptr(card_ptr,
-                                                    &_hot_cache[masked_index],
-                                                    current_ptr);
+  jbyte* previous_ptr = Atomic::cmpxchg(card_ptr,
+                                        &_hot_cache[masked_index],
+                                        current_ptr);
   return (previous_ptr == current_ptr) ? previous_ptr : card_ptr;
 }