--- a/hotspot/src/share/vm/gc/cms/compactibleFreeListSpace.cpp	Tue Jul 04 15:58:10 2017 +0200
+++ b/hotspot/src/share/vm/gc/cms/compactibleFreeListSpace.cpp	Thu Apr 13 09:57:51 2017 +0200
@@ -797,7 +797,7 @@
   // because the two are not necessarily equal for some kinds of
   // spaces, in particular, certain kinds of free list spaces.
   // We could use the more complicated but more precise:
-  // MemRegion(used_region().start(), round_to(used_region().end(), CardSize))
+  // MemRegion(used_region().start(), align_up(used_region().end(), CardSize))
   // but the slight imprecision seems acceptable in the assertion check.
   assert(MemRegion(bottom(), end()).contains(mr),
          "Should be within used space");
@@ -858,7 +858,7 @@
   assert_lock_strong(freelistLock());
   // Can't use used_region() below because it may not necessarily
   // be the same as [bottom(),end()); although we could
-  // use [used_region().start(),round_to(used_region().end(),CardSize)),
+  // use [used_region().start(),align_up(used_region().end(),CardSize)),
   // that appears too cumbersome, so we just do the simpler check
   // in the assertion below.
   assert(!mr.is_empty() && MemRegion(bottom(),end()).contains(mr),