summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRemi Collet <remi@php.net>2018-08-29 14:40:59 +0200
committerRemi Collet <remi@php.net>2018-08-29 14:40:59 +0200
commit8cc7e2a2df912d86f6b9dc3f3d40e5de1d93214b (patch)
tree5d3d76045e60563b1ee0ca54c8af2d6d3693f7d3
parent7728160784785771d1933f5f0a8c4d7a735470b0 (diff)
downloadphp-git-8cc7e2a2df912d86f6b9dc3f3d40e5de1d93214b.tar.gz
Revert "Don't report mmap failure if it is expected"
This reverts commit 446b5b15d324dacd30f58313563a9d625fb54ac8.
-rw-r--r--Zend/zend_alloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index d81616a87a..8eec54c6f7 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -432,7 +432,7 @@ static void *zend_mm_mmap_fixed(void *addr, size_t size)
void *ptr = mmap(addr, size, PROT_READ | PROT_WRITE, flags /*| MAP_POPULATE | MAP_HUGETLB*/, -1, 0);
if (ptr == MAP_FAILED) {
-#if ZEND_MM_ERROR && !defined(MAP_FIXED_NOREPLACE) && !defined(MAP_EXCL)
+#if ZEND_MM_ERROR
fprintf(stderr, "\nmmap() failed: [%d] %s\n", errno, strerror(errno));
#endif
return NULL;