From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 29 Oct 2015 05:45:22 +0000 (+0300)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha2~40^2~36^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d702c21d044877498f14faf143e5ca4c0c034a5;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  Don't remap .text segment if huge pages are not available.
---

4d702c21d044877498f14faf143e5ca4c0c034a5