[php-src] master: Merge branch 'PHP-8.3'
| From: | Bob Weinand | Date: | Mon, 18 Mar 2024 16:36:44 +0000 |
| Subject: | [php-src] master: Merge branch 'PHP-8.3' | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-127779@lists.php.net to get a copy of this message | ||
Author: Bob Weinand (bwoebi)
Date: 2024-03-18T17:22:48+01:00
Commit: https://github.com/php/php-src/commit/d539c4b8f6e412ec306e3f213c2d4b84bdb567be
Raw diff: https://github.com/php/php-src/commit/d539c4b8f6e412ec306e3f213c2d4b84bdb567be.diff
Merge branch 'PHP-8.3'
Changed paths:
M ext/opcache/shared_alloc_mmap.c
Diff:
diff --git a/ext/opcache/shared_alloc_mmap.c b/ext/opcache/shared_alloc_mmap.c
index 6821a356eab6..c715cdfb9ebb 100644
--- a/ext/opcache/shared_alloc_mmap.c
+++ b/ext/opcache/shared_alloc_mmap.c
@@ -52,7 +52,7 @@
static void *find_prefered_mmap_base(size_t requested_size)
{
size_t huge_page_size = 2 * 1024 * 1024;
- uintptr_t last_free_addr = 0;
+ uintptr_t last_free_addr = huge_page_size;
uintptr_t last_candidate = (uintptr_t)MAP_FAILED;
uintptr_t start, end, text_start = 0;
#if defined(__linux__)