*** old/src/share/vm/runtime/arguments.cpp	Wed Jan 15 01:42:19 2014
--- new/src/share/vm/runtime/arguments.cpp	Wed Jan 15 01:42:18 2014

*** 176,186 ****
--- 176,186 ----
                                                                   "Java Virtual Machine Specification",  false));
    PropertyList_add(&_system_properties, new SystemProperty("java.vm.version", VM_Version::vm_release(),  false));
    PropertyList_add(&_system_properties, new SystemProperty("java.vm.name", VM_Version::vm_name(),  false));
    PropertyList_add(&_system_properties, new SystemProperty("java.vm.info", VM_Version::vm_info_string(),  true));
  
!   // following are JVMTI agent writeable properties.
!   // Following are JVMTI agent writable properties.
    // Properties values are set to NULL and they are
    // os specific they are initialized in os::init_system_properties_values().
    _java_ext_dirs = new SystemProperty("java.ext.dirs", NULL,  true);
    _java_endorsed_dirs = new SystemProperty("java.endorsed.dirs", NULL,  true);
    _sun_boot_library_path = new SystemProperty("sun.boot.library.path", NULL,  true);

*** 1304,1314 ****
--- 1304,1314 ----
    // with YoungPLABSize and OldPLABSize options.
    // See CR 6362902.
    if (!FLAG_IS_DEFAULT(OldPLABSize)) {
      if (FLAG_IS_DEFAULT(CMSParPromoteBlocksToClaim)) {
        // OldPLABSize is not the default value but CMSParPromoteBlocksToClaim
!       // is.  In this situtation let CMSParPromoteBlocksToClaim follow
!       // is.  In this situation let CMSParPromoteBlocksToClaim follow
        // the value (either from the command line or ergonomics) of
        // OldPLABSize.  Following OldPLABSize is an ergonomics decision.
        FLAG_SET_ERGO(uintx, CMSParPromoteBlocksToClaim, OldPLABSize);
      } else {
        // OldPLABSize and CMSParPromoteBlocksToClaim are both set.

*** 3664,3685 ****
--- 3664,3685 ----
    }
  #else // INCLUDE_ALL_GCS
    assert(verify_serial_gc_flags(), "SerialGC unset");
  #endif // INCLUDE_ALL_GCS
  
-   // Initialize Metaspace flags and alignments.
    Metaspace::ergo_initialize();
  
    // Set bytecode rewriting flags
    set_bytecode_flags();
  
-   // Set flags if Aggressive optimization flags (-XX:+AggressiveOpts) enabled.
    set_aggressive_opts_flags();
  
    // Turn off biased locking for locking debug mode flags,
!   // which are subtlely different from each other but neither works with
-   // biased locking.
!   // which are subtly different from each other but neither works with
!   // biased locking
    if (UseHeavyMonitors
  #ifdef COMPILER1
        || !UseFastLocking
  #endif // COMPILER1
      ) {