diff src/share/vm/runtime/arguments.hpp @ 7212:291ffc492eb6

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Fri, 14 Dec 2012 14:35:13 +0100
parents 1baf7f1e3f23 53715fb1597d
children 989155e2d07a
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.hpp	Fri Dec 14 10:20:54 2012 +0100
+++ b/src/share/vm/runtime/arguments.hpp	Fri Dec 14 14:35:13 2012 +0100
@@ -420,6 +420,8 @@
  public:
   // Parses the arguments
   static jint parse(const JavaVMInitArgs* args);
+  // Adjusts the arguments after the OS have adjusted the arguments
+  static jint adjust_after_os();
   // Check for consistency in the selection of the garbage collector.
   static bool check_gc_consistency();
   // Check consistecy or otherwise of VM argument settings