# HG changeset patch
# User rehn
# Date 1498663002 -7200
# Node ID 5940af25f37e1c946c35e47cd1520bbbd3ed7e63
# Parent  0b817584e8a94161f587e6df8a6a570753e58de7# Parent  43f78fdf4859540ad7492d79cf8dcf23630a6a2f
Merge

diff -r 0b817584e8a9 -r 5940af25f37e hotspot/src/share/vm/runtime/globals.hpp
--- a/hotspot/src/share/vm/runtime/globals.hpp	Wed Jun 28 16:12:54 2017 +0200
+++ b/hotspot/src/share/vm/runtime/globals.hpp	Wed Jun 28 17:16:42 2017 +0200
@@ -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)               \