--- a/hotspot/src/cpu/s390/vm/vm_version_s390.cpp	Tue Dec 20 13:02:16 2016 +0000
+++ b/hotspot/src/cpu/s390/vm/vm_version_s390.cpp	Tue Dec 20 14:55:18 2016 +0100
@@ -155,9 +155,8 @@
     FLAG_SET_DEFAULT(UseGHASHIntrinsics, false);
   }
 
-  if (UseFMA) {
-    warning("FMA instructions are not available on this CPU");
-    FLAG_SET_DEFAULT(UseFMA, false);
+  if (FLAG_IS_DEFAULT(UseFMA)) {
+    FLAG_SET_DEFAULT(UseFMA, true);
   }
 
   // On z/Architecture, we take UseSHA as the general switch to enable/disable the SHA intrinsics.