# HG changeset patch
# User coleenp
# Date 1321378855 18000
# Node ID f9a80a035a4ad728bf22187fa6c3aace0b9f4420
# Parent  78bef05801ca8b77e2bbf4f2d8d2905b500616d7# Parent  3c7d67df8d0757d1d6c495dd72c7a1781322e109
Merge

diff -r 78bef05801ca -r f9a80a035a4a src/share/vm/runtime/globals.hpp
--- a/src/share/vm/runtime/globals.hpp	Thu Nov 10 04:46:08 2011 -0800
+++ b/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,                         \