aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc/src/erlang.xml
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2011-05-12 14:48:15 +0200
committerBjörn-Egil Dahlberg <[email protected]>2011-05-12 14:48:15 +0200
commita2c22ca4bd38644bcfd0611b2d0a72d6c10ce412 (patch)
treefc6226a4d945394ed9c626e9dc5607acc1155c97 /erts/doc/src/erlang.xml
parenteb26a54528e824f8f08af49d47281201bd8fefe3 (diff)
parent742722ec551b7cd4f9ee53190443ee422bb8c794 (diff)
downloadotp-a2c22ca4bd38644bcfd0611b2d0a72d6c10ce412.tar.gz
otp-a2c22ca4bd38644bcfd0611b2d0a72d6c10ce412.tar.bz2
otp-a2c22ca4bd38644bcfd0611b2d0a72d6c10ce412.zip
Merge branch 'sverker/halfword-high-alloc/OTP-9291' into dev
* sverker/halfword-high-alloc/OTP-9291: Present 'low' memory count for halfword-vm with erlang:memory() Fix faulty values from erlang:memory() on halfword-vm Allow allocator disable for high memory (better valgrind for halfword) Expand the use of high memory allocation in halfword emulator
Diffstat (limited to 'erts/doc/src/erlang.xml')
-rw-r--r--erts/doc/src/erlang.xml8
1 files changed, 8 insertions, 0 deletions
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 19f501391f..f98e15cb52 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -2356,6 +2356,14 @@ os_prompt%</pre>
<seealso marker="tools:instrument">instrument(3)</seealso>
and/or <seealso marker="erts:erl">erl(1)</seealso>.</p>
</item>
+ <tag><c>low</c></tag>
+ <item>
+ <p>Only on 64-bit halfword emulator.</p>
+ <p>The total amount of memory allocated in low memory areas
+ that are restricted to less than 4 Gb even though
+ the system may have more physical memory.</p>
+ <p>May be removed in future releases of halfword emulator.</p>
+ </item>
</taglist>
<note>
<p>The <c>system</c> value is not complete. Some allocated