*** old/src/share/vm/memory/metaspace.cpp	Fri Oct 25 15:29:00 2013
--- new/src/share/vm/memory/metaspace.cpp	Fri Oct 25 15:29:00 2013

*** 2963,2977 ****
--- 2963,2972 ----
    }
  }
  
  #endif
  
  // Align down. If the aligning result in 0, return 'alignment'.
  static size_t restricted_align_down(size_t size, size_t alignment) {
    return MAX2(alignment, align_size_down_(size, alignment));
  }
  
  void Metaspace::ergo_initialize() {
    if (DumpSharedSpaces) {
      // Using large pages when dumping the shared archive is currently not implemented.
      FLAG_SET_ERGO(bool, UseLargePagesInMetaspace, false);
    }

*** 2990,3017 ****
--- 2985,3012 ----
    // java.lang.management.MemoryUsage API.
    //
    // Ideally, we would be able to set the default value of MaxMetaspaceSize in
    // globals.hpp to the aligned value, but this is not possible, since the
    // alignment depends on other flags being parsed.
!   MaxMetaspaceSize = restricted_align_down(MaxMetaspaceSize, _reserve_alignment);
!   MaxMetaspaceSize = align_size_down_bounded(MaxMetaspaceSize, _reserve_alignment);
  
    if (MetaspaceSize > MaxMetaspaceSize) {
      MetaspaceSize = MaxMetaspaceSize;
    }
  
!   MetaspaceSize = restricted_align_down(MetaspaceSize, _commit_alignment);
!   MetaspaceSize = align_size_down_bounded(MetaspaceSize, _commit_alignment);
  
    assert(MetaspaceSize <= MaxMetaspaceSize, "MetaspaceSize should be limited by MaxMetaspaceSize");
  
    if (MetaspaceSize < 256*K) {
      vm_exit_during_initialization("Too small initial Metaspace size");
    }
  
!   MinMetaspaceExpansion = restricted_align_down(MinMetaspaceExpansion, _commit_alignment);
!   MaxMetaspaceExpansion = restricted_align_down(MaxMetaspaceExpansion, _commit_alignment);
!   MinMetaspaceExpansion = align_size_down_bounded(MinMetaspaceExpansion, _commit_alignment);
!   MaxMetaspaceExpansion = align_size_down_bounded(MaxMetaspaceExpansion, _commit_alignment);
  
!   CompressedClassSpaceSize = restricted_align_down(CompressedClassSpaceSize, _reserve_alignment);
!   CompressedClassSpaceSize = align_size_down_bounded(CompressedClassSpaceSize, _reserve_alignment);
    set_class_metaspace_size(CompressedClassSpaceSize);
  }
  
  void Metaspace::global_initialize() {
    // Initialize the alignment for shared spaces.