--- a/hotspot/src/share/vm/memory/metaspace.cpp	Fri May 23 21:34:49 2014 +0000
+++ b/hotspot/src/share/vm/memory/metaspace.cpp	Tue May 27 08:44:23 2014 -0700
@@ -3095,7 +3095,7 @@
 
 void Metaspace::global_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);