Merge 'sverker/maint-20/alloc-n-migration/ERIERL-88'

into 'sverker/master/alloc-n-migration/ERIERL-88'

1 files changed, 27 insertions, 10 deletions

diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 24e0773e41..771897ba94 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -7116,6 +7116,23 @@ ok
 
     <func>
       <name name="system_flag" arity="2" clause_i="4"/>
+      <fsummary>Set system flag for erts_alloc.</fsummary>
+      <desc>
+        <p>Sets system flags for
+	<seealso marker="erts:erts_alloc"><c>erts_alloc(3)</c></seealso>.
+        <c><anno>Alloc</anno></c> is the allocator to affect, for example
+	<c>binary_alloc</c>. <c><anno>F</anno></c> is the flag to change and
+	<c><anno>V</anno></c> is the new value.</p>
+	<p>Only a subset of all <c>erts_alloc</c> flags can be changed
+	at run time. This subset is currently only the flag
+	<seealso marker="erts:erts_alloc#M_sbct"><c>sbct</c></seealso>.</p>
+        <p>Returns <c>ok</c> if the flag was set or <c>notsup</c> if not
+	supported by <c>erts_alloc</c>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="system_flag" arity="2" clause_i="5"/>
       <fsummary>Set system flag fullsweep_after.</fsummary>
       <desc>
         <p>Sets system flag <c>fullsweep_after</c>.
@@ -7134,7 +7151,7 @@ ok
     </func>
 
     <func>
-      <name name="system_flag" arity="2" clause_i="5"
+      <name name="system_flag" arity="2" clause_i="6"
 	    anchor="system_flag_microstate_accounting"/>
       <fsummary>Set system flag microstate_accounting.</fsummary>
       <desc>
@@ -7148,7 +7165,7 @@ ok
     </func>
 
     <func>
-      <name name="system_flag" arity="2" clause_i="6"/>
+      <name name="system_flag" arity="2" clause_i="7"/>
       <fsummary>Set system flag min_heap_size.</fsummary>
       <desc>
         <p>Sets the default minimum heap size for processes. The size
@@ -7163,7 +7180,7 @@ ok
     </func>
 
     <func>
-      <name name="system_flag" arity="2" clause_i="7"/>
+      <name name="system_flag" arity="2" clause_i="8"/>
       <fsummary>Set system flag min_bin_vheap_size.</fsummary>
       <desc>
         <p>Sets the default minimum binary virtual heap size for
@@ -7180,7 +7197,7 @@ ok
     </func>
 
     <func>
-      <name name="system_flag" arity="2" clause_i="8"
+      <name name="system_flag" arity="2" clause_i="9"
 	    anchor="system_flag_max_heap_size"/>
       <fsummary>Set system flag max_heap_size.</fsummary>
       <type name="max_heap_size"/>
@@ -7198,7 +7215,7 @@ ok
     </func>
 
     <func>
-      <name name="system_flag" arity="2" clause_i="9"
+      <name name="system_flag" arity="2" clause_i="10"
 	    anchor="system_flag_multi_scheduling"/>
       <fsummary>Set system flag multi_scheduling.</fsummary>
       <desc>
@@ -7254,7 +7271,7 @@ ok
     </func>
 
     <func>
-      <name name="system_flag" arity="2" clause_i="10"
+      <name name="system_flag" arity="2" clause_i="11"
 	    anchor="system_flag_scheduler_bind_type"/>
       <fsummary>Set system flag scheduler_bind_type.</fsummary>
       <type name="scheduler_bind_type"/>
@@ -7381,7 +7398,7 @@ ok
     </func>
 
     <func>
-      <name name="system_flag" arity="2" clause_i="11"
+      <name name="system_flag" arity="2" clause_i="12"
 	    anchor="system_flag_scheduler_wall_time"/>
       <fsummary>Set system flag scheduler_wall_time.</fsummary>
       <desc>
@@ -7394,7 +7411,7 @@ ok
     </func>
 
     <func>
-      <name name="system_flag" arity="2" clause_i="12"
+      <name name="system_flag" arity="2" clause_i="13"
 	    anchor="system_flag_schedulers_online"/>
       <fsummary>Set system flag schedulers_online.</fsummary>
       <desc>
@@ -7423,7 +7440,7 @@ ok
     </func>
 
     <func>
-      <name name="system_flag" arity="2" clause_i="13"/>
+      <name name="system_flag" arity="2" clause_i="14"/>
       <fsummary>Set system flag trace_control_word.</fsummary>
       <desc>
         <p>Sets the value of the node trace control word to
@@ -7437,7 +7454,7 @@ ok
     </func>
 
     <func>
-      <name name="system_flag" arity="2" clause_i="14"
+      <name name="system_flag" arity="2" clause_i="15"
 	    anchor="system_flag_time_offset"/>
       <fsummary>Finalize the time offset.</fsummary>
       <desc>