--- old/src/share/vm/runtime/arguments.cpp	2016-08-15 19:49:25.897460400 -0700
+++ new/src/share/vm/runtime/arguments.cpp	2016-08-15 19:49:25.537485800 -0700
@@ -3543,6 +3543,13 @@
     return JNI_ERR;
   }
 
+  if (!FLAG_IS_DEFAULT(HeapDir)) {
+    if (!FLAG_IS_DEFAULT(UseNUMAInterleaving)) {
+      log_warning(arguments) ("NUMAInterleaving is not supported when HeapDir option is used.\n");
+    }
+    FLAG_SET_CMDLINE(bool, UseNUMAInterleaving, false);
+  }
+
   return JNI_OK;
 }