src/hotspot/share/runtime/arguments.cpp

*** 2532,2541 ****
--- 2532,2546 ----
        warning("PostLoopMultiversioning disabled because RangeCheckElimination is disabled.");
      }
      FLAG_SET_CMDLINE(bool, PostLoopMultiversioning, false);
    }
  #endif
+   if (!FLAG_IS_DEFAULT(AllocateHeapAt)) {
+     if ((UseNUMAInterleaving && !FLAG_IS_DEFAULT(UseNUMAInterleaving)) || (UseNUMA && !FLAG_IS_DEFAULT(UseNUMA))) {
+       log_warning(arguments) ("NUMA support for Heap depends on the file system when AllocateHeapAt option is used.\n");
+     }
+   }
    return status;
  }
  
  bool Arguments::is_bad_option(const JavaVMOption* option, jboolean ignore,
    const char* option_type) {
*** 4617,4627 ****
    return JNI_OK;
  }
  
  jint Arguments::adjust_after_os() {
    if (UseNUMA) {
!     if (UseParallelGC || UseParallelOldGC) {
        if (FLAG_IS_DEFAULT(MinHeapDeltaBytes)) {
           FLAG_SET_DEFAULT(MinHeapDeltaBytes, 64*M);
        }
      }
      // UseNUMAInterleaving is set to ON for all collectors and
--- 4622,4634 ----
    return JNI_OK;
  }
  
  jint Arguments::adjust_after_os() {
    if (UseNUMA) {
!     if (!FLAG_IS_DEFAULT(AllocateHeapAt)) {
!       FLAG_SET_ERGO(bool, UseNUMA, false);
!     } else if (UseParallelGC || UseParallelOldGC) {
        if (FLAG_IS_DEFAULT(MinHeapDeltaBytes)) {
           FLAG_SET_DEFAULT(MinHeapDeltaBytes, 64*M);
        }
      }
      // UseNUMAInterleaving is set to ON for all collectors and