# HG changeset patch
# User dholmes
# Date 1320025248 25200
# Node ID 6da94c5a6746ec69a042f65a68a818774a4abfbf
# Parent  5c8c7bef640337ab65fce5ae412eb9d666aaa71a# Parent  d5c4c73aa85594d6d166eb334423e586983e2232
Merge

diff -r 5c8c7bef6403 -r 6da94c5a6746 src/share/vm/runtime/globals.hpp
--- a/src/share/vm/runtime/globals.hpp	Fri Oct 28 18:30:47 2011 -0700
+++ b/src/share/vm/runtime/globals.hpp	Sun Oct 30 18:40:48 2011 -0700
@@ -2580,7 +2580,7 @@
   diagnostic(bool, DebugInlinedCalls, true,                                 \
          "If false, restricts profiled locations to the root method only")  \
                                                                             \
-  product(bool, PrintVMOptions, trueInDebug,                                \
+  product(bool, PrintVMOptions, NOT_EMBEDDED(trueInDebug) EMBEDDED_ONLY(false),\
          "Print flags that appeared on the command line")                   \
                                                                             \
   product(bool, IgnoreUnrecognizedVMOptions, false,                         \