Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/share/vm/runtime/arguments.cpp	Mon Jul 21 09:59:46 2014 +0200
     1.2 +++ b/src/share/vm/runtime/arguments.cpp	Mon Jul 21 09:59:54 2014 +0200
     1.3 @@ -1505,8 +1505,10 @@
     1.4      heap_alignment = G1CollectedHeap::conservative_max_heap_alignment();
     1.5    }
     1.6  #endif // INCLUDE_ALL_GCS
     1.7 -  _conservative_max_heap_alignment = MAX3(heap_alignment, os::max_page_size(),
     1.8 -    CollectorPolicy::compute_heap_alignment());
     1.9 +  _conservative_max_heap_alignment = MAX4(heap_alignment,
    1.10 +                                          (size_t)os::vm_allocation_granularity(),
    1.11 +                                          os::max_page_size(),
    1.12 +                                          CollectorPolicy::compute_heap_alignment());
    1.13  }
    1.14  
    1.15  void Arguments::set_ergonomics_flags() {