src/share/vm/memory/heap.cpp

rev 7181 : 8049864: TestParallelHeapSizeFlags fails with unexpected heap size
Reviewed-by: sjohanss, jmasa
rev 7184 : imported patch codecache-heap-aligned

*** 98,109 ****
  
    // Reserve and initialize space for _memory.
    size_t page_size = os::vm_page_size();
    if (os::can_execute_large_page_memory()) {
      const size_t min_pages = 8;
!     page_size = MIN2(os::page_size_for_region(committed_size, min_pages),
!                      os::page_size_for_region(reserved_size, min_pages));
    }
  
    const size_t granularity = os::vm_allocation_granularity();
    const size_t r_align = MAX2(page_size, granularity);
    const size_t r_size = align_size_up(reserved_size, r_align);
--- 98,109 ----
  
    // Reserve and initialize space for _memory.
    size_t page_size = os::vm_page_size();
    if (os::can_execute_large_page_memory()) {
      const size_t min_pages = 8;
!     page_size = MIN2(os::page_size_for_region_aligned(committed_size, min_pages),
!                      os::page_size_for_region_aligned(reserved_size, min_pages));
    }
  
    const size_t granularity = os::vm_allocation_granularity();
    const size_t r_align = MAX2(page_size, granularity);
    const size_t r_size = align_size_up(reserved_size, r_align);