--- old/src/hotspot/share/gc/g1/sparsePRT.cpp	2017-10-11 09:33:44.942243390 -0400
+++ new/src/hotspot/share/gc/g1/sparsePRT.cpp	2017-10-11 09:33:44.509302610 -0400
@@ -293,8 +293,7 @@
   while (true) {
     sprt->_next_expanded = hd;
     SparsePRT* res =
-      (SparsePRT*)
-      Atomic::cmpxchg_ptr(sprt, &_head_expanded_list, hd);
+      Atomic::cmpxchg(sprt, &_head_expanded_list, hd);
     if (res == hd) return;
     else hd = res;
   }
@@ -306,8 +305,7 @@
   while (hd != NULL) {
     SparsePRT* next = hd->next_expanded();
     SparsePRT* res =
-      (SparsePRT*)
-      Atomic::cmpxchg_ptr(next, &_head_expanded_list, hd);
+      Atomic::cmpxchg(next, &_head_expanded_list, hd);
     if (res == hd) {
       hd->set_next_expanded(NULL);
       return hd;