aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc/src
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2014-06-12 17:30:33 +0200
committerSverker Eriksson <[email protected]>2014-06-12 17:30:33 +0200
commitfe32a4c8b3f7d50607f6194dfb9ab70c35e76e2a (patch)
tree8264b999e67ee3b02ecd60c0a998de83d5e307f6 /erts/doc/src
parent58483fb7c1b976b94629692bf756fc35c8f15b2d (diff)
parentd284f024154cd8b1f8da219d716ad5aa6e8f539c (diff)
downloadotp-fe32a4c8b3f7d50607f6194dfb9ab70c35e76e2a.tar.gz
otp-fe32a4c8b3f7d50607f6194dfb9ab70c35e76e2a.tar.bz2
otp-fe32a4c8b3f7d50607f6194dfb9ab70c35e76e2a.zip
Merge branch 'maint'
Diffstat (limited to 'erts/doc/src')
-rw-r--r--erts/doc/src/erts_alloc.xml14
1 files changed, 4 insertions, 10 deletions
diff --git a/erts/doc/src/erts_alloc.xml b/erts/doc/src/erts_alloc.xml
index c9eca39a99..1ade41f1aa 100644
--- a/erts/doc/src/erts_alloc.xml
+++ b/erts/doc/src/erts_alloc.xml
@@ -4,7 +4,7 @@
<cref>
<header>
<copyright>
- <year>2002</year><year>2013</year>
+ <year>2002</year><year>2014</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
@@ -531,15 +531,9 @@
<p>Multiple, thread specific instances of the allocator.
This option will only have any effect on the runtime system
with SMP support. Default behaviour on the runtime system with
- SMP support:</p>
- <taglist>
- <tag><c>ll_alloc</c></tag>
- <item><c>1</c> instance.</item>
- <tag>Other allocators</tag>
- <item><c>NoSchedulers+1</c> instances. Each scheduler will use
- a lock-free instance of its own and other threads will use
- a common instance.</item>
- </taglist>
+ SMP support is <c>NoSchedulers+1</c> instances. Each scheduler will use
+ a lock-free instance of its own and other threads will use
+ a common instance.</p>
<p>It was previously (before ERTS version 5.9) possible to configure
a smaller amount of thread specific instances than schedulers.
This is, however, not possible any more.</p>