Merge
authorcoleenp
Tue, 15 Nov 2011 12:40:55 -0500
changeset 10991 e12451ab43c4
parent 10989 a8ce91b35dfc (current diff)
parent 10990 f71627d1b3dd (diff)
child 11001 4ba0436b3b29
child 11161 ec855b5a23c2
Merge
hotspot/src/share/vm/runtime/globals.hpp
--- a/hotspot/src/share/vm/runtime/globals.hpp	Thu Nov 10 04:46:08 2011 -0800
+++ b/hotspot/src/share/vm/runtime/globals.hpp	Tue Nov 15 12:40:55 2011 -0500
@@ -2580,7 +2580,7 @@
   diagnostic(bool, DebugInlinedCalls, true,                                 \
          "If false, restricts profiled locations to the root method only")  \
                                                                             \
-  product(bool, PrintVMOptions, NOT_EMBEDDED(trueInDebug) EMBEDDED_ONLY(false),\
+  product(bool, PrintVMOptions, false,                                      \
          "Print flags that appeared on the command line")                   \
                                                                             \
   product(bool, IgnoreUnrecognizedVMOptions, false,                         \