# HG changeset patch
# User tschatzl
# Date 1405929594 -7200
# Node ID c512f38a513977346058ed04d94cb3e50920ef76
# Parent  3bf2fc51186bd8353bb2bd7f837e5305750b3b72
8048088: Conservative maximum heap alignment should take vm_allocation_granularity into account
Summary: Also consider os::vm_allocation_granularity in the calculation.
Reviewed-by: brutisso

diff -r 3bf2fc51186b -r c512f38a5139 src/share/vm/runtime/arguments.cpp
--- a/src/share/vm/runtime/arguments.cpp	Mon Jul 21 09:59:46 2014 +0200
+++ b/src/share/vm/runtime/arguments.cpp	Mon Jul 21 09:59:54 2014 +0200
@@ -1505,8 +1505,10 @@
     heap_alignment = G1CollectedHeap::conservative_max_heap_alignment();
   }
 #endif // INCLUDE_ALL_GCS
-  _conservative_max_heap_alignment = MAX3(heap_alignment, os::max_page_size(),
-    CollectorPolicy::compute_heap_alignment());
+  _conservative_max_heap_alignment = MAX4(heap_alignment,
+                                          (size_t)os::vm_allocation_granularity(),
+                                          os::max_page_size(),
+                                          CollectorPolicy::compute_heap_alignment());
 }
 
 void Arguments::set_ergonomics_flags() {