Mercurial > hg > truffle

diff src/share/vm/runtime/arguments.cpp @ 6646:c38f13903fdf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ just before the NPG (no perm gen) changeset
author Doug Simon <doug.simon@oracle.com>
date Mon, 29 Oct 2012 21:10:04 +0100
parents d56d600819fe bb3f6194fedb
children e522a00b91aa 8c5333c80cfd
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp	Mon Oct 29 20:02:54 2012 +0100
+++ b/src/share/vm/runtime/arguments.cpp	Mon Oct 29 21:10:04 2012 +0100
@@ -1934,7 +1934,7 @@
       (ExplicitGCInvokesConcurrent ||
        ExplicitGCInvokesConcurrentAndUnloadsClasses)) {
     jio_fprintf(defaultStream::error_stream(),
-                "error: +ExplictGCInvokesConcurrent[AndUnloadsClasses] conflicts"
+                "error: +ExplicitGCInvokesConcurrent[AndUnloadsClasses] conflicts"
                 " with -UseAsyncConcMarkSweepGC");
     status = false;
   }