--- a/src/hotspot/cpu/s390/templateTable_s390.cpp	Mon Oct 30 21:23:10 2017 +0100
+++ b/src/hotspot/cpu/s390/templateTable_s390.cpp	Mon Nov 06 18:53:38 2017 +0100
@@ -275,6 +275,13 @@
       }
     }
     break;
+  case BarrierSet::Epsilon:
+    if (val_is_null) {
+      __ store_heap_oop_null(val, offset, base);
+    } else {
+      __ store_heap_oop(val, offset, base);
+    }
+    break;
   case BarrierSet::ModRef:
     // fall through
   default: