From 300925cc0de95650cf5b13e938ccf702a8eadc9e Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Thu, 4 May 2017 17:07:41 +0200
Subject: erts: temp_alloc can no longer be disabled

temp_alloc is used in such a way that if it ever results
in a malloc/free sequence it will slow down the system
alot. So it will no longer be possible to disable it and
it will not be disabled when using +Mea min.

OTP-14651
---
 erts/doc/src/erts_alloc.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'erts/doc')

diff --git a/erts/doc/src/erts_alloc.xml b/erts/doc/src/erts_alloc.xml
index d3f725ef99..580780e73b 100644
--- a/erts/doc/src/erts_alloc.xml
+++ b/erts/doc/src/erts_alloc.xml
@@ -87,9 +87,9 @@
         the number of system calls made.</item>
     </taglist>
 
-    <p><c>sys_alloc</c> and <c>literal_alloc</c> are always enabled and
-      cannot be disabled. <c>exec_alloc</c> is only available if it is needed
-      and cannot be disabled. <c>mseg_alloc</c> is always enabled if it is
+    <p><c>sys_alloc</c>, <c>literal_alloc</c> and <c>temp_alloc</c> are always
+      enabled and cannot be disabled. <c>exec_alloc</c> is only available if it
+      is needed and cannot be disabled. <c>mseg_alloc</c> is always enabled if it is
       available and an allocator that uses it is enabled. All other
       allocators can be <seealso marker="#M_e">enabled or disabled</seealso>.
       By default all allocators are enabled.
-- 
cgit v1.2.3