--- a/hotspot/src/cpu/s390/vm/frame_s390.inline.hpp	Tue Jul 04 15:58:10 2017 +0200
+++ b/hotspot/src/cpu/s390/vm/frame_s390.inline.hpp	Thu Apr 13 09:57:51 2017 +0200
@@ -241,7 +241,7 @@
 
 inline int frame::interpreter_frame_monitor_size() {
   // Number of stack slots for a monitor
-  return round_to(BasicObjectLock::size() /* number of stack slots */,
+  return align_up(BasicObjectLock::size() /* number of stack slots */,
                   WordsPerLong /* Number of stack slots for a Java long. */);
 }