--- old/src/share/vm/runtime/arguments.cpp	2017-07-20 17:45:03.067930600 -0700
+++ new/src/share/vm/runtime/arguments.cpp	2017-07-20 17:45:02.682583500 -0700
@@ -3647,6 +3647,14 @@
     return JNI_ERR;
   }
 
+  if (!FLAG_IS_DEFAULT(HeapDir)) {
+    if (!FLAG_IS_DEFAULT(UseNUMAInterleaving) || !FLAG_IS_DEFAULT(UseNUMA)) {
+      log_warning(arguments) ("NUMA support depends on the file system when HeapDir option is used.\n");
+    }
+    FLAG_SET_CMDLINE(bool, UseNUMAInterleaving, false);
+    FLAG_SET_CMDLINE(bool, UseNUMA, false);
+  }
+
   return JNI_OK;
 }