Merge branch 'master' of ssh://sources.redhat.com/git/systemtap

2 files changed, 21 insertions, 0 deletions

diff --git a/doc/SystemTap_Tapset_Reference/tapsets.tmpl b/doc/SystemTap_Tapset_Reference/tapsets.tmpl
index 705cd3b5..c8c5ed72 100644
--- a/doc/SystemTap_Tapset_Reference/tapsets.tmpl
+++ b/doc/SystemTap_Tapset_Reference/tapsets.tmpl
@@ -146,6 +146,16 @@
 !Itapset/proc_mem.stp
   </chapter>
 
+  <chapter id="task_time_stp">
+    <title>Task Time Tapset</title>
+    <para>
+      This tapset defines utility functions to query time related
+      properties of the current tasks, translate those in miliseconds
+      and human readable strings.
+    </para>
+!Itapset/task_time.stp
+  </chapter>
+
   <chapter id="iosched.stp">
     <title>IO Scheduler Tapset</title>
     <para>
diff --git a/doc/langref.tex b/doc/langref.tex
index 523deb1b..3afe6128 100644
--- a/doc/langref.tex
+++ b/doc/langref.tex
@@ -1816,6 +1816,17 @@ probe kernel.function (
 %( arch == "ia64" %?
     probe syscall.vliw = kernel.function("vliw_widget") {}
 %)
+
+\end{verbatim}
+\end{vindent}
+
+The following code adapts to the presence of a kernel CONFIG option.
+
+\begin{vindent}
+\begin{verbatim}
+%( CONFIG_UTRACE == "y" %?
+    probe process.syscall {}
+%)
 \end{verbatim}
 \end{vindent}