diff options
| author | Rickard Green <[email protected]> | 2010-11-18 11:47:28 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2010-11-18 11:48:47 +0100 |
| commit | 839dcbfe1285b292c4208c696ceae4b22c46aff7 (patch) | |
| tree | 71ae1faa8c1cf3f8b31cded6eb2ea71093a4fb29 /erts/doc | |
| parent | ab9932741308ee226173256c1f7a5f6481c33217 (diff) | |
| parent | 667409afe4f909d18f6e19e6ca5a65a4848e51d6 (diff) | |
| download | otp-839dcbfe1285b292c4208c696ceae4b22c46aff7.tar.gz otp-839dcbfe1285b292c4208c696ceae4b22c46aff7.tar.bz2 otp-839dcbfe1285b292c4208c696ceae4b22c46aff7.zip | |
Merge branch 'pg/freebsd-cpu-affinity-and-topology' into dev
* pg/freebsd-cpu-affinity-and-topology:
Add support for CPU affinity & topology detection on FreeBSD 8
OTP-8939
Diffstat (limited to 'erts/doc')
| -rw-r--r-- | erts/doc/src/erl.xml | 2 | ||||
| -rw-r--r-- | erts/doc/src/erlang.xml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml index e8a9501ace..a1d73fb698 100644 --- a/erts/doc/src/erl.xml +++ b/erts/doc/src/erl.xml @@ -686,7 +686,7 @@ </p></item> </taglist> <p>Binding of schedulers is currently only supported on newer - Linux, Solaris, and Windows systems.</p> + Linux, Solaris, FreeBSD, and Windows systems.</p> <p>If no CPU topology is available when the <c>+sbt</c> flag is processed and <c>BindType</c> is any other type than <c>u</c>, the runtime system will fail to start. CPU diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml index 25c92bdbb7..638f7eef10 100644 --- a/erts/doc/src/erlang.xml +++ b/erts/doc/src/erlang.xml @@ -5178,7 +5178,7 @@ true</pre> <seealso marker="#system_info_scheduler_bindings">erlang:system_info(scheduler_bindings)</seealso>. </p> <p>Schedulers can currently only be bound on newer Linux, - Solaris, and Windows systems, but more systems will be + Solaris, FreeBSD, and Windows systems, but more systems will be supported in the future. </p> <p>In order for the runtime system to be able to bind schedulers, @@ -5559,7 +5559,7 @@ true</pre> <item> <p>Returns the automatically detected <c>CpuTopology</c>. The emulator currently only detects the CPU topology on some newer - Linux, Solaris, and Windows systems. On Windows system with + Linux, Solaris, FreeBSD, and Windows systems. On Windows system with more than 32 logical processors the CPU topology is not detected. </p> <p>For more information see the documentation of the |