From eaf521f8ee0c94f715ce0e36aff02599ae26762e Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Mon, 12 May 2008 21:20:45 +0200
Subject: [PATCH] --- yaml --- r: 100446 b: refs/heads/master c:
 1d4db00a5e30c7b8f8dc2a1b19e886fd942be143 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/kernel/trace/trace.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ac04e02699ea..d421f273d25a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 08bafa0efcf29fe18ec39c2147077b597368b018
+refs/heads/master: 1d4db00a5e30c7b8f8dc2a1b19e886fd942be143
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
index 8755a4370484..6580e7ed04be 100644
--- a/trunk/kernel/trace/trace.c
+++ b/trunk/kernel/trace/trace.c
@@ -289,6 +289,13 @@ int register_tracer(struct tracer *type)
 			printk(KERN_CONT "FAILED!\n");
 			goto out;
 		}
+		/* Only reset on passing, to avoid touching corrupted buffers */
+		for_each_possible_cpu(i) {
+			data = tr->data[i];
+			if (!head_page(data))
+				continue;
+			tracing_reset(data);
+		}
 		printk(KERN_CONT "PASSED\n");
 	}
 #endif