8325983: Build failure after JDK-8324580

Reviewed-by: stuefe, dcubed
This commit is contained in:
Zdenek Zambersky 2024-02-15 21:10:56 +00:00 committed by Daniel D. Daugherty
parent 3b1062d45d
commit 0fdfdf71f2
2 changed files with 5 additions and 5 deletions
src/hotspot/os/linux
test/hotspot/jtreg/runtime/os

@ -312,14 +312,14 @@ THPSupport HugePages::_thp_support;
ShmemTHPSupport HugePages::_shmem_thp_support;
size_t HugePages::thp_pagesize_fallback() {
// Older kernels won't publish the THP page size. Fall back to default static huge page size,
// Older kernels won't publish the THP page size. Fall back to default explicit huge page size,
// since that is likely to be the THP page size as well. Don't do it if the page size is considered
// too large to avoid large alignment waste. If static huge page size is unknown, use educated guess.
// too large to avoid large alignment waste. If explicit huge page size is unknown, use educated guess.
if (thp_pagesize() != 0) {
return thp_pagesize();
}
if (supports_static_hugepages()) {
return MIN2(default_static_hugepage_size(), 16 * M);
if (supports_explicit_hugepages()) {
return MIN2(default_explicit_hugepage_size(), 16 * M);
}
return 2 * M;
}

@ -93,7 +93,7 @@ class HugePageConfiguration {
if (pageSize != 0) {
return pageSize;
}
pageSize = getStaticDefaultHugePageSize();
pageSize = getExplicitDefaultHugePageSize();
if (pageSize != 0) {
return Math.min(pageSize, 16 * 1024 * 1024);
}