--- old/src/hotspot/share/gc/g1/g1Arguments.cpp	2019-09-21 06:25:05.865962265 -0700
+++ new/src/hotspot/share/gc/g1/g1Arguments.cpp	2019-09-21 06:25:05.509962277 -0700
@@ -158,6 +158,16 @@
     FLAG_SET_DEFAULT(ParallelRefProcEnabled, true);
   }
 
+  if (UseNUMA) {
+    if (FLAG_IS_DEFAULT(AlwaysPreTouch)) {
+      FLAG_SET_DEFAULT(AlwaysPreTouch, true);
+    }
+    if (!AlwaysPreTouch && FLAG_IS_CMDLINE(AlwaysPreTouch)) {
+      warning("Disabling AlwaysPreTouch is incompatible with UseNUMA. Disabling UseNUMA.");
+      FLAG_SET_ERGO(UseNUMA, false);
+    }
+  }
+
   log_trace(gc)("MarkStackSize: %uk  MarkStackSizeMax: %uk", (unsigned int) (MarkStackSize / K), (uint) (MarkStackSizeMax / K));
 
   // By default do not let the target stack size to be more than 1/4 of the entries