From e52b62c74b111fd14e0b69313f671e2d5c01356b Mon Sep 17 00:00:00 2001
From: "Steven Rostedt (Red Hat)" <srostedt@redhat.com>
Date: Mon, 4 Mar 2013 23:26:06 -0500
Subject: [PATCH] --- yaml --- r: 364927 b: refs/heads/master c:
 873c642f5964b260480850040dec21e42d0ae4e4 h: refs/heads/master i:   364925:
 136e0a73f4601bfba83c14ddabfc89357a0b818f   364923:
 b31805b6172712a0b45f6644c519b74aad7bb83b   364919:
 bc14a63c9231eb2ea3bd977e097b5a633f3773ce   364911:
 8c5d2575f961ae44317dfeeb4e82eab76813a189   364895:
 b11c860beff3105bf13304d4a8c5988ff4c35876   364863:
 87a416b80d3ea22032ec15f0a9af06d70b935a5d   364799:
 f421e7140d9f8462db34c806fd94306eb726a271 v: v3

---
 [refs]                            |  2 +-
 trunk/kernel/trace/trace.c        | 10 ++++++++--
 trunk/kernel/trace/trace.h        |  2 +-
 trunk/kernel/trace/trace_events.c | 10 +++++++---
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index f231d539817e..5d4922131aa4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 575380da8b46969a2c6a7e14a51056a63b30fe2e
+refs/heads/master: 873c642f5964b260480850040dec21e42d0ae4e4
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
index b5b25b6575a9..c8a852a55db4 100644
--- a/trunk/kernel/trace/trace.c
+++ b/trunk/kernel/trace/trace.c
@@ -912,9 +912,15 @@ void tracing_reset_current(int cpu)
 	tracing_reset(&global_trace, cpu);
 }
 
-void tracing_reset_current_online_cpus(void)
+void tracing_reset_all_online_cpus(void)
 {
-	tracing_reset_online_cpus(&global_trace);
+	struct trace_array *tr;
+
+	mutex_lock(&trace_types_lock);
+	list_for_each_entry(tr, &ftrace_trace_arrays, list) {
+		tracing_reset_online_cpus(tr);
+	}
+	mutex_unlock(&trace_types_lock);
 }
 
 #define SAVED_CMDLINES 128
diff --git a/trunk/kernel/trace/trace.h b/trunk/kernel/trace/trace.h
index 6728a249e817..fa60b2977524 100644
--- a/trunk/kernel/trace/trace.h
+++ b/trunk/kernel/trace/trace.h
@@ -496,7 +496,7 @@ int tracing_is_enabled(void);
 void tracing_reset(struct trace_array *tr, int cpu);
 void tracing_reset_online_cpus(struct trace_array *tr);
 void tracing_reset_current(int cpu);
-void tracing_reset_current_online_cpus(void);
+void tracing_reset_all_online_cpus(void);
 int tracing_open_generic(struct inode *inode, struct file *filp);
 struct dentry *trace_create_file(const char *name,
 				 umode_t mode,
diff --git a/trunk/kernel/trace/trace_events.c b/trunk/kernel/trace/trace_events.c
index 9a7dc4bf1171..a376ab5eec5c 100644
--- a/trunk/kernel/trace/trace_events.c
+++ b/trunk/kernel/trace/trace_events.c
@@ -1649,14 +1649,18 @@ static void trace_module_remove_events(struct module *mod)
 		list_del(&file_ops->list);
 		kfree(file_ops);
 	}
+	up_write(&trace_event_mutex);
 
 	/*
 	 * It is safest to reset the ring buffer if the module being unloaded
-	 * registered any events that were used.
+	 * registered any events that were used. The only worry is if
+	 * a new module gets loaded, and takes on the same id as the events
+	 * of this module. When printing out the buffer, traced events left
+	 * over from this module may be passed to the new module events and
+	 * unexpected results may occur.
 	 */
 	if (clear_trace)
-		tracing_reset_current_online_cpus();
-	up_write(&trace_event_mutex);
+		tracing_reset_all_online_cpus();
 }
 
 static int trace_module_notify(struct notifier_block *self,