--- a/hotspot/src/share/vm/oops/instanceKlass.hpp	Wed Apr 12 17:53:18 2017 +0200
+++ b/hotspot/src/share/vm/oops/instanceKlass.hpp	Tue Jul 04 15:58:10 2017 +0200
@@ -100,7 +100,7 @@
 
   // sizeof(OopMapBlock) in words.
   static const int size_in_words() {
-    return align_size_up((int)sizeof(OopMapBlock), wordSize) >>
+    return align_up((int)sizeof(OopMapBlock), wordSize) >>
       LogBytesPerWord;
   }