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

1 files changed, 37 insertions, 30 deletions

diff --git a/stap.1.in b/stap.1.in
index 6706ad7f..7c62205b 100644
--- a/stap.1.in
+++ b/stap.1.in
@@ -215,36 +215,36 @@ If the size of output file will exceed
 output files exceed
 .B N
 , systemtap removes the oldest output file. You can omit the second argument.
-\" PR6864: disable temporarily 
-\".TP
-\".B \-\-kelf
-\"For names and addresses of functions to probe,
-\"consult the symbol tables in the kernel and modules.
-\"This can be useful if your kernel and/or modules were compiled
-\"without debugging information, or the function you want to probe
-\"is in an assembly-language file built without debugging information.
-\"See the
-\".B "MAKING DO WITH SYMBOL TABLES"
-\"section for more information.
-\".TP
-\".BI \-\-kmap [=FILE] 
-\"For names and addresses of kernel functions to probe,
-\"consult the symbol table in the indicated text file.
-\"The default is /boot/System.map-VERSION.
-\"The contents of this file should be in the form of the default output from
-\".IR nm (1).
-\"Only symbols of type T or t are used.
-\"If you specify /proc/kallsyms or some other file in that format,
-\"where lines for module symbols contain a fourth column,
-\"reading of the symbol table stops with the first module symbol
-\"(which should be right after the last kernel symbol).
-\"As with
-\".BR \-\-kelf ,
-\"the symbol table in each module's .ko file will also be consulted.
-\"See the
-\".B "MAKING DO WITH SYMBOL TABLES"
-\"section for more information.
-\" --ignore-{vmlinux,dwarf} shouldn't be visible 
+.\" PR6864: disable temporarily 
+.\".TP
+.\".B \-\-kelf
+.\"For names and addresses of functions to probe,
+.\"consult the symbol tables in the kernel and modules.
+.\"This can be useful if your kernel and/or modules were compiled
+.\"without debugging information, or the function you want to probe
+.\"is in an assembly-language file built without debugging information.
+.\"See the
+.\".B "MAKING DO WITH SYMBOL TABLES"
+.\"section for more information.
+.\".TP
+.\".BI \-\-kmap [=FILE] 
+.\"For names and addresses of kernel functions to probe,
+.\"consult the symbol table in the indicated text file.
+.\"The default is /boot/System.map-VERSION.
+.\"The contents of this file should be in the form of the default output from
+.\".IR nm (1).
+.\"Only symbols of type T or t are used.
+.\"If you specify /proc/kallsyms or some other file in that format,
+.\"where lines for module symbols contain a fourth column,
+.\"reading of the symbol table stops with the first module symbol
+.\"(which should be right after the last kernel symbol).
+.\"As with
+.\".BR \-\-kelf ,
+.\"the symbol table in each module's .ko file will also be consulted.
+.\"See the
+.\".B "MAKING DO WITH SYMBOL TABLES"
+.\"section for more information.
+.\" --ignore-{vmlinux,dwarf} shouldn't be visible 
 .TP
 .B \-\-skip\-badvars
 Ignore out of context variables and substitute with literal 0.
@@ -1117,6 +1117,13 @@ Maximum number of concurrently armed user-space probes (uprobes), default
 somewhat larger than the number of user-space probe points named in the script.
 This pool needs to be potentialy large because individual uprobe objects (about
 64 bytes each) are allocated for each process for each matching script-level probe.
+.TP
+STP_MAXMEMORY
+Maximum amount of memory (in kilobytes) that the systemtap module
+should use, default unlimited.  The memory size includes the size of
+the module itself, plus any additional allocations.  This only tracks
+direct allocations by the systemtap runtime.  This does not track
+indirect allocations (as done by kprobes/uprobes/etc. internals). 
 
 .PP
 With scripts that contain probes on any interrupt path, it is possible that