Merge
authorbrutisso
Wed, 16 Mar 2016 14:58:19 +0000
changeset 37127 59f56fa66aba
parent 37121 373b0cfbfd4b (current diff)
parent 37126 ed3f8d81d85c (diff)
child 37128 ea9e0371b8e6
Merge
--- a/hotspot/src/share/vm/runtime/globals.hpp	Wed Mar 16 13:28:07 2016 +0000
+++ b/hotspot/src/share/vm/runtime/globals.hpp	Wed Mar 16 14:58:19 2016 +0000
@@ -2212,10 +2212,10 @@
           "Decay factor to TenuredGenerationSizeIncrement")                 \
           range(1, max_uintx)                                               \
                                                                             \
-  product(uintx, MaxGCPauseMillis, max_uintx,                               \
+  product(uintx, MaxGCPauseMillis, max_uintx - 1,                           \
           "Adaptive size policy maximum GC pause time goal in millisecond, "\
           "or (G1 Only) the maximum GC time per MMU time slice")            \
-          range(1, max_uintx)                                               \
+          range(1, max_uintx - 1)                                           \
           constraint(MaxGCPauseMillisConstraintFunc,AfterMemoryInit)        \
                                                                             \
   product(uintx, GCPauseIntervalMillis, 0,                                  \