--- a/hotspot/src/share/vm/runtime/globals.hpp	Tue Feb 22 15:26:36 2011 -0800
+++ b/hotspot/src/share/vm/runtime/globals.hpp	Wed Feb 23 11:18:16 2011 -0800
@@ -3661,10 +3661,10 @@
   manageable(bool, PrintConcurrentLocks, false,                             \
           "Print java.util.concurrent locks in thread dump")                \
                                                                             \
-  diagnostic(bool, TransmitErrorReport, false,                              \
+  product(bool, TransmitErrorReport, false,                                 \
           "Enable error report transmission on erroneous termination")      \
                                                                             \
-  diagnostic(ccstr, ErrorReportServer, NULL,                                \
+  product(ccstr, ErrorReportServer, NULL,                                   \
           "Override built-in error report server address")                  \
                                                                             \
   /* Shared spaces */                                                       \
@@ -3695,7 +3695,7 @@
   product(uintx, SharedReadOnlySize,   10*M,                                \
           "Size of read-only space in permanent generation (in bytes)")     \
                                                                             \
-  product(uintx, SharedMiscDataSize,    4*M,                                \
+  product(uintx, SharedMiscDataSize,    NOT_LP64(4*M) LP64_ONLY(5*M),       \
           "Size of the shared data area adjacent to the heap (in bytes)")   \
                                                                             \
   product(uintx, SharedMiscCodeSize,    4*M,                                \