--- a/hotspot/src/share/vm/code/codeCache.cpp	Tue Jul 04 15:58:10 2017 +0200
+++ b/hotspot/src/share/vm/code/codeCache.cpp	Thu Apr 13 09:57:51 2017 +0200
@@ -406,7 +406,7 @@
 
   // Reserve Space
   size_t size_initial = MIN2(InitialCodeCacheSize, rs.size());
-  size_initial = round_to(size_initial, os::vm_page_size());
+  size_initial = align_up(size_initial, os::vm_page_size());
   if (!heap->reserve(rs, size_initial, CodeCacheSegmentSize)) {
     vm_exit_during_initialization("Could not reserve enough space for code cache");
   }
@@ -1041,7 +1041,7 @@
   // This was originally just a check of the alignment, causing failure, instead, round
   // the code cache to the page size.  In particular, Solaris is moving to a larger
   // default page size.
-  CodeCacheExpansionSize = round_to(CodeCacheExpansionSize, os::vm_page_size());
+  CodeCacheExpansionSize = align_up(CodeCacheExpansionSize, os::vm_page_size());
 
   if (SegmentedCodeCache) {
     // Use multiple code heaps