From 3b3ec9ad1412c6834cd7a4522d2b6a6db228f652 Mon Sep 17 00:00:00 2001 From: Vladimir Petko Date: Mon, 3 Aug 2026 10:35:33 +1200 Subject: [PATCH] 8389588: [s390x] Zero build is broken after JDK-8388561 --- src/hotspot/os_cpu/linux_s390/os_linux_s390.cpp | 6 ------ src/hotspot/share/runtime/os.cpp | 7 +++++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/hotspot/os_cpu/linux_s390/os_linux_s390.cpp b/src/hotspot/os_cpu/linux_s390/os_linux_s390.cpp index 4ad61e605fb..9276d1d744b 100644 --- a/src/hotspot/os_cpu/linux_s390/os_linux_s390.cpp +++ b/src/hotspot/os_cpu/linux_s390/os_linux_s390.cpp @@ -478,9 +478,3 @@ int os::extra_bang_size_in_bytes() { void os::setup_fpu() {} -uintptr_t os::vm_page_table_expansion_point() { - // On s390x, page table will dynamically expand based on user demand - // (eg mmap probing with high addresses). First expansion happens - // at 2^42 (4TB). - return nth_bit(42); -} diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp index e3437a097ef..dba4c98ca4b 100644 --- a/src/hotspot/share/runtime/os.cpp +++ b/src/hotspot/share/runtime/os.cpp @@ -1999,6 +1999,13 @@ static void shuffle_fisher_yates(T* arr, unsigned num, FastRandom& frand) { uintptr_t os::vm_page_table_expansion_point() { return align_down(UINTPTR_MAX, os::vm_allocation_granularity()); } +#else +uintptr_t os::vm_page_table_expansion_point() { + // On s390x, page table will dynamically expand based on user demand + // (eg mmap probing with high addresses). First expansion happens + // at 2^42 (4TB). + return nth_bit(42); +} #endif // Helper for os::attempt_reserve_memory_between