Fri, 15 Mar 2013 17:12:17 -0700
Merge
1.1 --- a/src/share/vm/memory/metaspace.cpp Fri Mar 15 17:24:40 2013 -0400 1.2 +++ b/src/share/vm/memory/metaspace.cpp Fri Mar 15 17:12:17 2013 -0700 1.3 @@ -334,6 +334,9 @@ 1.4 1.5 // byte_size is the size of the associated virtualspace. 1.6 VirtualSpaceNode::VirtualSpaceNode(size_t byte_size) : _top(NULL), _next(NULL), _rs(0) { 1.7 + // align up to vm allocation granularity 1.8 + byte_size = align_size_up(byte_size, os::vm_allocation_granularity()); 1.9 + 1.10 // This allocates memory with mmap. For DumpSharedspaces, allocate the 1.11 // space at low memory so that other shared images don't conflict. 1.12 // This is the same address as memory needed for UseCompressedOops but