--- a/src/hotspot/cpu/s390/templateTable_s390.cpp	Mon Mar 12 12:28:43 2018 +0100
+++ b/src/hotspot/cpu/s390/templateTable_s390.cpp	Mon Mar 12 16:53:47 2018 +0100
@@ -259,6 +259,15 @@
         }
       }
       break;
+    case BarrierSet::Epsilon:
+      {
+        if (val_is_null) {
+          __ store_heap_oop_null(val, offset, base);
+        } else {
+          __ store_heap_oop(val, offset, base);
+        }
+      }
+      break;
 #endif // INCLUDE_ALL_GCS
     case BarrierSet::CardTableModRef:
     {
@@ -274,15 +283,6 @@
       }
     }
     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: