src/share/vm/runtime/arguments.cpp

*** 3541,3550 ****
--- 3541,3557 ----
  
    if (!check_vm_args_consistency()) {
      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;
  }
  
  // Helper class for controlling the lifetime of JavaVMInitArgs
  // objects.  The contents of the JavaVMInitArgs are guaranteed to be