--- old/src/cpu/s390/vm/c1_CodeStubs_s390.cpp	2016-12-24 09:13:16.552193813 -0500
+++ new/src/cpu/s390/vm/c1_CodeStubs_s390.cpp	2016-12-24 09:13:15.364126673 -0500
@@ -473,7 +473,8 @@
 
   __ z_ltgr(Z_R1_scratch, pre_val_reg); // Pass oop in Z_R1_scratch to Runtime1::g1_pre_barrier_slow_id.
   __ branch_optimized(Assembler::bcondZero, _continuation);
-  ce->emit_call_c(Runtime1::entry_for (Runtime1::g1_pre_barrier_slow_id));
+  Runtime1::StubID id = patch_code() == lir_patch_none ? Runtime1::g1_pre_barrier_slow_id : Runtime1::g1_pre_barrier_slow_with_recheck_id;
+  ce->emit_call_c(Runtime1::entry_for(id));
   CHECK_BAILOUT();
   __ branch_optimized(Assembler::bcondAlways, _continuation);
 }