diff src/share/vm/runtime/arguments.cpp @ 2176:27e4ea99855d

Merge
author johnc
date Thu, 27 Jan 2011 13:42:28 -0800
parents bb2c2878f134 234761c55641
children d25d4ca69222 59e20a452a2a c08677f98289
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp	Thu Jan 27 14:05:59 2011 -0500
+++ b/src/share/vm/runtime/arguments.cpp	Thu Jan 27 13:42:28 2011 -0800
@@ -1941,10 +1941,16 @@
     status = false;
   }
 
+#ifndef SERIALGC
   if (UseG1GC) {
     status = status && verify_percentage(InitiatingHeapOccupancyPercent,
                                          "InitiatingHeapOccupancyPercent");
+    status = status && verify_min_value(G1RefProcDrainInterval, 1,
+                                        "G1RefProcDrainInterval");
+    status = status && verify_min_value((intx)G1ConcMarkStepDurationMillis, 1,
+                                        "G1ConcMarkStepDurationMillis");
   }
+#endif
 
   status = status && verify_interval(RefDiscoveryPolicy,
                                      ReferenceProcessor::DiscoveryPolicyMin,