From a0b9d993cb8a37a8e7eb7d709006e3961ad9107c 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: 100445 b: refs/heads/master c:
 08bafa0efcf29fe18ec39c2147077b597368b018 h: refs/heads/master i:   100443:
 0b74ce9e13de1ece389c7862f3703aaf05fa0342 v: v3

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

diff --git a/[refs] b/[refs]
index f25f762a6b50..ac04e02699ea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e3c3333f3bd7eedfd21b1155b3c7cd24fc7f754
+refs/heads/master: 08bafa0efcf29fe18ec39c2147077b597368b018
diff --git a/trunk/kernel/trace/trace_selftest.c b/trunk/kernel/trace/trace_selftest.c
index 4c8a1b2d8231..a6f1ed75f836 100644
--- a/trunk/kernel/trace/trace_selftest.c
+++ b/trunk/kernel/trace/trace_selftest.c
@@ -67,6 +67,8 @@ trace_test_buffer_cpu(struct trace_array *tr, struct trace_array_cpu *data)
 	return 0;
 
  failed:
+	/* disable tracing */
+	tracing_disabled = 1;
 	printk(KERN_CONT ".. corrupted trace buffer .. ");
 	return -1;
 }