Merge
authorehelin
Wed, 28 Jun 2017 15:21:48 +0000
changeset 46581 4435f84dfa04
parent 46579 5940af25f37e (diff)
parent 46580 130fde4acb34 (current diff)
child 46586 5c2a3a2e86ea
Merge
--- a/hotspot/src/share/vm/runtime/globals.hpp	Wed Jun 28 14:17:28 2017 +0200
+++ b/hotspot/src/share/vm/runtime/globals.hpp	Wed Jun 28 15:21:48 2017 +0000
@@ -1304,7 +1304,7 @@
   product(bool, UseBiasedLocking, true,                                     \
           "Enable biased locking in JVM")                                   \
                                                                             \
-  product(intx, BiasedLockingStartupDelay, 4000,                            \
+  product(intx, BiasedLockingStartupDelay, 0,                               \
           "Number of milliseconds to wait before enabling biased locking")  \
           range(0, (intx)(max_jint-(max_jint%PeriodicTask::interval_gran))) \
           constraint(BiasedLockingStartupDelayFunc,AfterErgo)               \