Merge branch 'maint'

Conflicts:
	erts/emulator/beam/beam_emu.c
	erts/emulator/beam/bif.tab
	erts/preloaded/ebin/prim_file.beam
	lib/hipe/cerl/erl_bif_types.erl

1 files changed, 27 insertions, 1 deletions

diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index da0ef8fbe2..9c8c033e29 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -5213,6 +5213,8 @@ ok
       <name name="system_info" arity="1" clause_i="48"/>
       <name name="system_info" arity="1" clause_i="49"/>
       <name name="system_info" arity="1" clause_i="50"/>
+      <name name="system_info" arity="1" clause_i="51"/>
+      <name name="system_info" arity="1" clause_i="52"/>
       <fsummary>Information about the system</fsummary>
       <desc>
         <p>Returns various information about the current system
@@ -5306,6 +5308,29 @@ ok
               used by the runtime system. It will be on the form
               <seealso marker="erts:erl_driver#version_management">"&lt;major ver&gt;.&lt;minor ver&gt;"</seealso>.</p>
           </item>
+          <tag><c>dynamic_trace</c></tag>
+          <item>
+            <p>Returns an atom describing the dynamic trace framework
+            compiled into the virtual machine. It can currently be either
+            <c>dtrace</c>, <c>systemtap</c> or <c>none</c>. For a
+            commercial or standard build, this is always <c>none</c>,
+            the other return values indicate a custom configuration
+            (e.g. <c>./configure --with-dynamic-trace=dtrace</c>). See
+            the <seealso marker="runtime_tools:dyntrace">dyntrace
+            </seealso> manual page and the
+            <c>README.dtrace</c>/<c>README.systemtap</c> files in the
+            Erlang source code top directory for more information
+            about dynamic tracing.</p>
+          </item>
+          <tag><c>dynamic_trace_probes</c></tag>
+          <item>
+            <p>Returns a <c>boolean()</c> indicating if dynamic trace probes
+            (either dtrace or systemtap) are built into the
+            emulator. This can only be <c>true</c> if the virtual
+            machine was built for dynamic tracing
+            (i.e. <c>system_info(dynamic_trace)</c> returns
+            <c>dtrace</c> or <c>systemtap</c>).</p>
+          </item>
           <tag><c>elib_malloc</c></tag>
           <item>
             <p>This option will be removed in a future release.
@@ -5588,7 +5613,8 @@ ok
 	    <seealso marker="#system_info_schedulers">erlang:system_info(schedulers)</seealso>,
 	    and
 	    <seealso marker="#system_flag_schedulers_online">erlang:system_flag(schedulers_online, SchedulersOnline)</seealso>.
-	    </p>
+	    </p>      <name name="system_info" arity="1" clause_i="50"/>
+
           </item>
           <tag><c>smp_support</c></tag>
           <item>