changeset 30609:211c22831646

8079263: Suppress warning about disabling adaptive size policy when enabling UseLargePages with UseNUMA when adaptive size policy is disabled Reviewed-by: jmasa, jwilhelm
author redestad
date Fri, 08 May 2015 15:41:39 +0200
parents d79880a5cf2f
children d4f41f692503
files hotspot/src/os/linux/vm/os_linux.cpp
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/src/os/linux/vm/os_linux.cpp	Fri May 08 10:30:16 2015 +0200
+++ b/hotspot/src/os/linux/vm/os_linux.cpp	Fri May 08 15:41:39 2015 +0200
@@ -4760,8 +4760,8 @@
             FLAG_IS_DEFAULT(UseSHM) &&
             FLAG_IS_DEFAULT(UseHugeTLBFS)) {
           UseLargePages = false;
-        } else {
-          warning("UseNUMA is not fully compatible with SHM/HugeTLBFS large pages, disabling adaptive resizing");
+        } else if (UseAdaptiveSizePolicy || UseAdaptiveNUMAChunkSizing) {
+          warning("UseNUMA is not fully compatible with SHM/HugeTLBFS large pages, disabling adaptive resizing (-XX:-UseAdaptiveSizePolicy -XX:-UseAdaptiveNUMAChunkSizing)");
           UseAdaptiveSizePolicy = false;
           UseAdaptiveNUMAChunkSizing = false;
         }