3 files changed, 18 insertions, 2 deletions

diff --git a/Documentation/trace-cmd-record.1.txt b/Documentation/trace-cmd-record.1.txt
index 81e37ac..9a51f91 100644
--- a/Documentation/trace-cmd-record.1.txt
+++ b/Documentation/trace-cmd-record.1.txt
@@ -138,6 +138,15 @@ OPTIONS
     inside the kernel. Using "-b 10000" on a machine with 4 CPUs will make
     Ftrace have a total buffer size of 40 Megs.
 
+*-k*::
+    By default, when trace-cmd is finished tracing, it will reset the buffers
+    and disable all the tracing that it enabled. This option keeps trace-cmd
+    from disabling the tracer and reseting the buffer. This option is useful for
+    debugging trace-cmd.
+
+    Note: usually trace-cmd will set the "tracing_on" file back to what it
+    was before it was called. This option will leave that file set to zero.
+
 *-N* 'host:port'::
     If another machine is running "trace-cmd listen", this option is used to
     have the data sent to that machine with UDP packets. Instead of writing
diff --git a/trace-cmd.c b/trace-cmd.c
index bd5254a..cdb0735 100644
--- a/trace-cmd.c
+++ b/trace-cmd.c
@@ -1407,6 +1407,7 @@ int main (int argc, char **argv)
         int extract = 0;
         int run_command = 0;
         int neg_event = 0;
+        int keep = 0;
         int fset;
         int cpu;
 
@@ -1430,7 +1431,7 @@ int main (int argc, char **argv)
                    (strcmp(argv[1], "start") == 0) ||
                    ((extract = strcmp(argv[1], "extract") == 0))) {
 
-                while ((c = getopt(argc-1, argv+1, "+he:f:Fp:do:O:s:r:vg:l:n:P:N:tb:")) >= 0) {
+                while ((c = getopt(argc-1, argv+1, "+he:f:Fp:do:O:s:r:vg:l:n:P:N:tb:k")) >= 0) {
                         switch (c) {
                         case 'h':
                                 usage(argv);
@@ -1539,6 +1540,9 @@ int main (int argc, char **argv)
                         case 'b':
                                 buffer_size = atoi(optarg);
                                 break;
+                        case 'k':
+                                keep = 1;
+                                break;
                         }
                 }
 
@@ -1707,6 +1711,9 @@ int main (int argc, char **argv)
                 printf("\n");
         }
 
+        if (keep)
+                exit(0);
+
         /* Turn off everything */
         disable_all();
 
@@ -1714,7 +1721,6 @@ int main (int argc, char **argv)
         if (tracing_on_init_val)
                 write_tracing_on(tracing_on_init_val);
 
-
         exit(0);
 
         return 0;
diff --git a/trace-usage.c b/trace-usage.c
index 9df19eb..2d7b668 100644
--- a/trace-usage.c
+++ b/trace-usage.c
@@ -36,6 +36,7 @@ static struct usage_help usage_help[] = {
                 "          -N host:port to connect to (see listen)\n"
                 "          -t used with -N, forces use of tcp in live trace\n"
                 "          -b change kernel buffersize (in kilobytes per CPU)\n"
+                "          -k do not reset the buffers after tracing.\n"
         },
         {
                 "start",