From 7ef0ade9b1633f4d7b2302673ae901500e7655ee Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Tue, 14 Jun 2011 22:44:07 -0400
Subject: [PATCH] --- yaml --- r: 257099 b: refs/heads/master c:
 cf30cf67d6c7592c670ec946d89fc15ee0deb0eb h: refs/heads/master i:   257097:
 2bb36c44adbfda53b57eddfd5be6416715b26d03   257095:
 fa0e4d4ef40d11a10e5305a5b55e7d05dc05d512 v: v3

---
 [refs]                     | 2 +-
 trunk/kernel/trace/trace.c | 6 ++++--
 trunk/kernel/trace/trace.h | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ee6f9f2af937..5026a5231fbc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f271a2a60c748599b30bb4dafff30d770439b96
+refs/heads/master: cf30cf67d6c7592c670ec946d89fc15ee0deb0eb
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
index 9c557ae6a21e..42fdf3adff31 100644
--- a/trunk/kernel/trace/trace.c
+++ b/trunk/kernel/trace/trace.c
@@ -425,6 +425,7 @@ static const char *trace_options[] = {
 	"graph-time",
 	"record-cmd",
 	"overwrite",
+	"disable_on_free",
 	NULL
 };
 
@@ -3518,8 +3519,9 @@ tracing_free_buffer_write(struct file *filp, const char __user *ubuf,
 static int
 tracing_free_buffer_release(struct inode *inode, struct file *filp)
 {
-	/* disable tracing */
-	tracing_off();
+	/* disable tracing ? */
+	if (trace_flags & TRACE_ITER_STOP_ON_FREE)
+		tracing_off();
 	/* resize the ring buffer to 0 */
 	tracing_resize_ring_buffer(0);
 
diff --git a/trunk/kernel/trace/trace.h b/trunk/kernel/trace/trace.h
index 229f8591f61d..742f545ae185 100644
--- a/trunk/kernel/trace/trace.h
+++ b/trunk/kernel/trace/trace.h
@@ -609,6 +609,7 @@ enum trace_iterator_flags {
 	TRACE_ITER_GRAPH_TIME		= 0x80000,
 	TRACE_ITER_RECORD_CMD		= 0x100000,
 	TRACE_ITER_OVERWRITE		= 0x200000,
+	TRACE_ITER_STOP_ON_FREE		= 0x400000,
 };
 
 /*