# HG changeset patch
# User minqi
# Date 1401205463 25200
# Node ID 678a467a733be54ca3c6ea280fe6ce117600e6ea
# Parent  c49cd31b6da63db8373f38bc1b398fc8fe91c624
8038422: CDS test failed: assert((size % os::vm_allocation_granularity()) == 0) failed when limiting SharedMiscDataSize
Summary: In debug version, the assert is against os::vm_allocation_granularity(), but in initialization, we use os::vm_page_size() to align the allocation size. In windows, _vm_page_size and _vm_allocation_granularity may not be same. In debug version, the assert is against os::vm_allocation_granularity(), but in initialization, we use os::vm_page_size() to align the allocation size. In windows, _vm_page_size and _vm_allocation_granularity may not be same.
Reviewed-by: dholmes, iklam, jiangli, coleenp
Contributed-by: yumin.qi@oracle.com

diff -r c49cd31b6da6 -r 678a467a733b src/share/vm/memory/metaspace.cpp
--- a/src/share/vm/memory/metaspace.cpp	Sat Oct 25 21:02:29 2014 -1000
+++ b/src/share/vm/memory/metaspace.cpp	Tue May 27 08:44:23 2014 -0700
@@ -3141,7 +3141,7 @@
   MetaspaceGC::initialize();
 
   // Initialize the alignment for shared spaces.
-  int max_alignment = os::vm_page_size();
+  int max_alignment = os::vm_allocation_granularity();
   size_t cds_total = 0;
 
   MetaspaceShared::set_max_alignment(max_alignment);