--- a/src/hotspot/cpu/s390/c1_MacroAssembler_s390.hpp	Tue Jun 05 23:06:32 2018 -0700
+++ b/src/hotspot/cpu/s390/c1_MacroAssembler_s390.hpp	Wed Jun 06 10:11:23 2018 +0200
@@ -95,8 +95,6 @@
   void invalidate_registers(Register preserve1 = noreg, Register preserve2 = noreg,
                             Register preserve3 = noreg) PRODUCT_RETURN;
 
-  void nop() { z_nop(); }
-
   // This platform only uses signal-based null checks. The Label is not needed.
   void null_check(Register r, Label *Lnull = NULL) { MacroAssembler::null_check(r); }