--- a/hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.inline.hpp	Tue Jul 04 15:58:10 2017 +0200
+++ b/hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.inline.hpp	Thu Apr 13 09:57:51 2017 +0200
@@ -446,7 +446,7 @@
   // Align the end of mr so it's at a card boundary.
   // This is superfluous except at the end of the space;
   // we should do better than this XXX
-  MemRegion mr2(mr.start(), (HeapWord*)round_to((intptr_t)mr.end(),
+  MemRegion mr2(mr.start(), align_up(mr.end(),
                  CardTableModRefBS::card_size /* bytes */));
   _t->mark_range(mr2);
 }
@@ -455,7 +455,7 @@
   // Align the end of mr so it's at a card boundary.
   // This is superfluous except at the end of the space;
   // we should do better than this XXX
-  MemRegion mr2(mr.start(), (HeapWord*)round_to((intptr_t)mr.end(),
+  MemRegion mr2(mr.start(), align_up(mr.end(),
                  CardTableModRefBS::card_size /* bytes */));
   _t->par_mark_range(mr2);
 }