src/hotspot/share/runtime/arguments.cpp

rev 56448 : imported patch 8220310.mut.0
rev 56449 : imported patch 8220310.mut.1
rev 56453 : [mq]: 8220310.mut.3-kim

*** 4101,4118 ****
      } else if (UseParallelGC || UseParallelOldGC) {
        if (FLAG_IS_DEFAULT(MinHeapDeltaBytes)) {
           FLAG_SET_DEFAULT(MinHeapDeltaBytes, 64*M);
        }
      }
!     // UseNUMAInterleaving is set to ON for all collectors and
!     // platforms when UseNUMA is set to ON. NUMA-aware collectors
!     // such as the parallel collector for Linux and Solaris will
!     // interleave old gen and survivor spaces on top of NUMA
!     // allocation policy for the eden space.
!     // Non NUMA-aware collectors such as CMS, G1 and Serial-GC on
!     // all platforms and ParallelGC on Windows will interleave all
!     // of the heap spaces across NUMA nodes.
      if (FLAG_IS_DEFAULT(UseNUMAInterleaving)) {
        FLAG_SET_ERGO(UseNUMAInterleaving, true);
      }
    }
    return JNI_OK;
--- 4101,4115 ----
      } else if (UseParallelGC || UseParallelOldGC) {
        if (FLAG_IS_DEFAULT(MinHeapDeltaBytes)) {
           FLAG_SET_DEFAULT(MinHeapDeltaBytes, 64*M);
        }
      }
!     // UseNUMAInterleaving is set to ON for all collectors and platforms when
!     // UseNUMA is set to ON. NUMA-aware collectors will interleave old gen and
!     // survivor spaces on top of NUMA allocation policy for the eden space.
!     // Non NUMA-aware collectors will interleave all of the heap spaces across
!     // NUMA nodes.
      if (FLAG_IS_DEFAULT(UseNUMAInterleaving)) {
        FLAG_SET_ERGO(UseNUMAInterleaving, true);
      }
    }
    return JNI_OK;