archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 06:14:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Niclas Adlertz 2014-09-19 17:14:13 +02:00
commit 37c8ef911c
331 changed files with 14826 additions and 8842 deletions
Download patch file Download diff file Expand all files Collapse all files

3
hotspot/src/share/vm/code/codeCache.cpp
View file

@ -232,7 +232,8 @@ void CodeCache::initialize_heaps() {
ReservedCodeSpace CodeCache::reserve_heap_memory(size_t size) {
// Determine alignment
const size_t page_size = os::can_execute_large_page_memory() ?
os::page_size_for_region(InitialCodeCacheSize, size, 8) :
MIN2(os::page_size_for_region(InitialCodeCacheSize, 8),
os::page_size_for_region(size, 8)) :
os::vm_page_size();
const size_t granularity = os::vm_allocation_granularity();
const size_t r_align = MAX2(page_size, granularity);