From 0fdfdf71f242b39f2e758fcff99bd61060fa2870 Mon Sep 17 00:00:00 2001 From: Zdenek Zambersky Date: Thu, 15 Feb 2024 21:10:56 +0000 Subject: [PATCH] 8325983: Build failure after JDK-8324580 Reviewed-by: stuefe, dcubed --- src/hotspot/os/linux/hugepages.cpp | 8 ++++---- test/hotspot/jtreg/runtime/os/HugePageConfiguration.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/hotspot/os/linux/hugepages.cpp b/src/hotspot/os/linux/hugepages.cpp index 07a0f4dd42c..b71593487cf 100644 --- a/src/hotspot/os/linux/hugepages.cpp +++ b/src/hotspot/os/linux/hugepages.cpp @@ -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; } diff --git a/test/hotspot/jtreg/runtime/os/HugePageConfiguration.java b/test/hotspot/jtreg/runtime/os/HugePageConfiguration.java index 7a6bd09eb7e..adde51ec75f 100644 --- a/test/hotspot/jtreg/runtime/os/HugePageConfiguration.java +++ b/test/hotspot/jtreg/runtime/os/HugePageConfiguration.java @@ -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); }