From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 14 Jul 2014 19:29:48 +0000 (-0700)
Subject: 3.4-stable patches
X-Git-Tag: v3.4.99~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=03534444bb40234b5025ca940fdcbd71258e2a6e;p=thirdparty%2Fkernel%2Fstable-queue.git

3.4-stable patches

added patches:
	tracing-remove-ftrace_stop-start-from-reading-the-trace-file.patch
---

diff --git a/queue-3.4/series b/queue-3.4/series
index 67eea97966f..afb317265f1 100644
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -7,3 +7,4 @@ hwmon-adm1029-ensure-the-fan_div-cache-is-updated-in-set_fan_div.patch
 powerpc-perf-never-program-book3s-pmcs-with-values-0x80000000.patch
 ext4-clarify-error-count-warning-messages.patch
 drm-radeon-stop-poisoning-the-gart-tlb.patch
+tracing-remove-ftrace_stop-start-from-reading-the-trace-file.patch
diff --git a/queue-3.4/tracing-remove-ftrace_stop-start-from-reading-the-trace-file.patch b/queue-3.4/tracing-remove-ftrace_stop-start-from-reading-the-trace-file.patch
new file mode 100644
index 00000000000..0c11cba9586
--- /dev/null
+++ b/queue-3.4/tracing-remove-ftrace_stop-start-from-reading-the-trace-file.patch
@@ -0,0 +1,40 @@
+From 099ed151675cd1d2dbeae1dac697975f6a68716d Mon Sep 17 00:00:00 2001
+From: "Steven Rostedt (Red Hat)" <rostedt@goodmis.org>
+Date: Tue, 24 Jun 2014 23:50:09 -0400
+Subject: tracing: Remove ftrace_stop/start() from reading the trace file
+
+From: "Steven Rostedt (Red Hat)" <rostedt@goodmis.org>
+
+commit 099ed151675cd1d2dbeae1dac697975f6a68716d upstream.
+
+Disabling reading and writing to the trace file should not be able to
+disable all function tracing callbacks. There's other users today
+(like kprobes and perf). Reading a trace file should not stop those
+from happening.
+
+Reviewed-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
+Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ kernel/trace/trace.c |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/kernel/trace/trace.c
++++ b/kernel/trace/trace.c
+@@ -1052,7 +1052,6 @@ void tracing_start(void)
+ 
+ 	arch_spin_unlock(&ftrace_max_lock);
+ 
+-	ftrace_start();
+  out:
+ 	raw_spin_unlock_irqrestore(&tracing_start_lock, flags);
+ }
+@@ -1068,7 +1067,6 @@ void tracing_stop(void)
+ 	struct ring_buffer *buffer;
+ 	unsigned long flags;
+ 
+-	ftrace_stop();
+ 	raw_spin_lock_irqsave(&tracing_start_lock, flags);
+ 	if (trace_stop_count++)
+ 		goto out;