--- a/hotspot/src/share/vm/memory/filemap.hpp	Wed Apr 12 17:53:18 2017 +0200
+++ b/hotspot/src/share/vm/memory/filemap.hpp	Tue Jul 04 15:58:10 2017 +0200
@@ -254,9 +254,9 @@
 
   // The ro+rw+md+mc spaces size
   static size_t core_spaces_size() {
-    return align_size_up((SharedReadOnlySize + SharedReadWriteSize +
-                          SharedMiscDataSize + SharedMiscCodeSize),
-                          os::vm_allocation_granularity());
+    return align_up((SharedReadOnlySize + SharedReadWriteSize +
+                     SharedMiscDataSize + SharedMiscCodeSize),
+                     os::vm_allocation_granularity());
   }
 
   // The estimated optional space size.