src/hotspot/os/linux/os_linux.cpp

@@ -5125,12 +5125,13 @@
   if (!Linux::libnuma_init()) {
     UseNUMA = false;
   } else {
     if ((Linux::numa_max_node() < 1) || Linux::is_bound_to_single_node()) {
       // If there's only one node (they start from 0) or if the process
-      // is bound explicitly to a single node using membind, disable NUMA.
-      UseNUMA = false;
+      // is bound explicitly to a single node using membind, disable NUMA unless
+      // user explicilty forces NUMA optimizations on single-node/UMA systems
+      UseNUMA = ForceNUMA;
     } else {
 
       LogTarget(Info,os) log;
       LogStream ls(log);
 

@@ -5165,14 +5166,10 @@
               "disabling adaptive resizing (-XX:-UseAdaptiveSizePolicy -XX:-UseAdaptiveNUMAChunkSizing)");
       UseAdaptiveSizePolicy = false;
       UseAdaptiveNUMAChunkSizing = false;
     }
   }
-
-  if (!UseNUMA && ForceNUMA) {
-    UseNUMA = true;
-  }
 }
 
 // this is called _after_ the global arguments have been parsed
 jint os::init_2(void) {