*** old/src/share/vm/memory/filemap.cpp	Thu Aug 15 09:50:16 2013
--- new/src/share/vm/memory/filemap.cpp	Thu Aug 15 09:50:14 2013

*** 360,378 ****
--- 360,375 ----
  
  // Map the whole region at once, assumed to be allocated contiguously.
  ReservedSpace FileMapInfo::reserve_shared_memory() {
    struct FileMapInfo::FileMapHeader::space_info* si = &_header._space[0];
    char* requested_addr = si->_base;
    size_t alignment = os::vm_allocation_granularity();
  
!   size_t size = align_size_up(SharedReadOnlySize + SharedReadWriteSize +
                                SharedMiscDataSize + SharedMiscCodeSize,
                                alignment);
!   size_t size = FileMapInfo::shared_spaces_size();
  
    // Reserve the space first, then map otherwise map will go right over some
    // other reserved memory (like the code cache).
!   ReservedSpace rs(size, alignment, false, requested_addr);
!   ReservedSpace rs(size, os::vm_allocation_granularity(), false, requested_addr);
    if (!rs.is_reserved()) {
      fail_continue(err_msg("Unable to reserve shared space at required address " INTPTR_FORMAT, requested_addr));
      return rs;
    }
    // the reserved virtual memory is for mapping class data sharing archive

*** 557,561 ****
--- 554,574 ----
      gclog_or_tty->print("  %s " INTPTR_FORMAT "-" INTPTR_FORMAT,
                          shared_region_name[i],
                          si->_base, si->_base + si->_used);
    }
  }
+ 
+ // Unmap mapped regions of shared space.
+ void FileMapInfo::stop_sharing_and_unmap(const char* msg) {
+   FileMapInfo *map_info = FileMapInfo::current_info();
+   if (map_info) {
+     map_info->fail_continue(msg);
+     for (int i = 0; i < MetaspaceShared::n_regions; i++) {
+       if (map_info->_header._space[i]._base != NULL) {
+         map_info->unmap_region(i);
+         map_info->_header._space[i]._base = NULL;
+       }
+     }
+   } else if (DumpSharedSpaces) {
+     fail_stop(msg, NULL);
+   }
+ }