diff src/share/vm/runtime/globals.hpp @ 6840:6e5a59a8e4a7

Merge
author rbackman
date Tue, 09 Oct 2012 07:41:27 +0200
parents 22b8d3d181d9 bacdc1d5c21c
children d804e148cff8 bdb5f8c9978b
line wrap: on
line diff
--- a/src/share/vm/runtime/globals.hpp	Fri Oct 05 13:37:08 2012 -0700
+++ b/src/share/vm/runtime/globals.hpp	Tue Oct 09 07:41:27 2012 +0200
@@ -1066,9 +1066,6 @@
                                                                             \
   product(bool, MonitorInUseLists, false, "Track Monitors for Deflation")   \
                                                                             \
-  product(intx, Atomics, 0,                                                 \
-          "(Unsafe,Unstable) Diagnostic - Controls emission of atomics")    \
-                                                                            \
   product(intx, SyncFlags, 0, "(Unsafe,Unstable) Experimental Sync flags" ) \
                                                                             \
   product(intx, SyncVerbose, 0, "(Unstable)" )                              \