--- old/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp	2017-11-11 10:42:45.733088968 -0800
+++ new/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp	2017-11-11 10:42:45.417074825 -0800
@@ -687,7 +687,8 @@
 }
 
 address TemplateInterpreterGenerator::generate_deopt_entry_for (TosState state,
-                                                               int step) {
+                                                               int step,
+                                                               address continuation) {
   address entry = __ pc();
 
   BLOCK_COMMENT("deopt_entry {");
@@ -710,7 +711,11 @@
     __ should_not_reach_here();
     __ bind(L);
   }
-  __ dispatch_next(state, step);
+  if (continuation == NULL) {
+    __ dispatch_next(state, step);
+  } else {
+    __ jump_to_entry(continuation, Z_R1_scratch);
+  }
 
   BLOCK_COMMENT("} deopt_entry");