com php-src: Merge branch 'PHP-7.3' into PHP-7.4: Zend/zend_a lloc.c
| From: | Nikita Popov | Date: | Mon, 18 Feb 2019 13:04:30 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.3' into PHP-7.4: Zend/zend_a lloc.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-104690@lists.php.net to get a copy of this message | ||
Commit: 709b8aaf9fa5fc81946aa9698abb1533bd38a439
Author: Nikita Popov <nikita.ppv@gmail.com> Mon, 18 Feb 2019 14:04:30 +0100
Parents: c9ffae1bec67d628d2859368be66175b5c693de5 3b3fafa637914d59c5588d72ddd0f6016642be0a
Branches: PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=709b8aaf9fa5fc81946aa9698abb1533bd38a439
Log:
Merge branch 'PHP-7.3' into PHP-7.4
Changed paths:
MM Zend/zend_alloc.c
Diff:
diff --cc Zend/zend_alloc.c
index 139fb69,11f5b46..f0ceb4d
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@@ -190,12 -191,10 +190,10 @@@ typedef struct _zend_mm_free_slot zend
typedef struct _zend_mm_chunk zend_mm_chunk;
typedef struct _zend_mm_huge_list zend_mm_huge_list;
- #ifdef MAP_HUGETLB
int zend_mm_use_huge_pages = 0;
- #endif
/*
- * Memory is retrived from OS by chunks of fixed size 2MB.
+ * Memory is retrieved from OS by chunks of fixed size 2MB.
* Inside chunk it's managed by pages of fixed size 4096B.
* So each chunk consists from 512 pages.
* The first page of each chunk is reseved for chunk header.