Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/memory/heap.cpp	Thu Dec 18 09:37:02 2014 +0100
     1.2 +++ b/src/share/vm/memory/heap.cpp	Tue Jun 24 15:50:50 2014 +0200
     1.3 @@ -97,9 +97,13 @@
     1.4    _log2_segment_size = exact_log2(segment_size);
     1.5  
     1.6    // Reserve and initialize space for _memory.
     1.7 -  const size_t page_size = os::can_execute_large_page_memory() ?
     1.8 -          os::page_size_for_region(committed_size, reserved_size, 8) :
     1.9 -          os::vm_page_size();
    1.10 +  size_t page_size = os::vm_page_size();
    1.11 +  if (os::can_execute_large_page_memory()) {
    1.12 +    const size_t min_pages = 8;
    1.13 +    page_size = MIN2(os::page_size_for_region(committed_size, min_pages),
    1.14 +                     os::page_size_for_region(reserved_size, min_pages));
    1.15 +  }
    1.16 +
    1.17    const size_t granularity = os::vm_allocation_granularity();
    1.18    const size_t r_align = MAX2(page_size, granularity);
    1.19    const size_t r_size = align_size_up(reserved_size, r_align);