delete queue-4.3/tracing-stacktrace-show-entire-trace-if-passed-in-function-not-found...

diff --git a/queue-4.3/series b/queue-4.3/series
index f278e19f5a21ad1d98d2cfb6a8d1e97963928b17..3a2b4e8681050efcd453fe5ea661c4a4f2637c34 100644 (file)
--- a/queue-4.3/series
+++ b/queue-4.3/series
@@ -63,7 +63,6 @@ pci-host-mark-pcie-pci-msi-irq-cascade-handlers-as-irqf_no_thread.patch
 pci-fix-minimum-allocation-address-overwrite.patch
 tracing-update-instance_rmdir-to-use-tracefs_remove_recursive.patch
 tracing-fix-setting-of-start_index-in-find_next.patch
-tracing-stacktrace-show-entire-trace-if-passed-in-function-not-found.patch
 tracefs-fix-refcount-imbalance-in-start_creating.patch
 jbd2-fix-checkpoint-list-cleanup.patch
 jbd2-fix-unreclaimed-pages-after-truncate-in-data-journal-mode.patch

diff --git a/queue-4.3/tracing-stacktrace-show-entire-trace-if-passed-in-function-not-found.patch b/queue-4.3/tracing-stacktrace-show-entire-trace-if-passed-in-function-not-found.patch
deleted file mode 100644 (file)
index b170c33..0000000
--- a/queue-4.3/tracing-stacktrace-show-entire-trace-if-passed-in-function-not-found.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 6ccd83714a009ee301b50c15f6c3a5dc1f30164c Mon Sep 17 00:00:00 2001
-From: Steven Rostedt <rostedt@goodmis.org>
-Date: Fri, 29 Jan 2016 10:22:41 -0500
-Subject: tracing/stacktrace: Show entire trace if passed in function not found
-
-From: Steven Rostedt <rostedt@goodmis.org>
-
-commit 6ccd83714a009ee301b50c15f6c3a5dc1f30164c upstream.
-
-When a max stack trace is discovered, the stack dump is saved. In order to
-not record the overhead of the stack tracer, the ip of the traced function
-is looked for within the dump. The trace is started from the location of
-that function. But if for some reason the ip is not found, the entire stack
-trace is then truncated. That's not very useful. Instead, print everything
-if the ip of the traced function is not found within the trace.
-
-This issue showed up on s390.
-
-Link: http://lkml.kernel.org/r/20160129102241.1b3c9c04@gandalf.local.home
-
-Fixes: 72ac426a5bb0 ("tracing: Clean up stack tracing and fix fentry updates")
-Reported-by: Heiko Carstens <heiko.carstens@de.ibm.com>
-Tested-by: Heiko Carstens <heiko.carstens@de.ibm.com>
-Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- kernel/trace/trace_stack.c |    7 +++++++
- 1 file changed, 7 insertions(+)
-
---- a/kernel/trace/trace_stack.c
-+++ b/kernel/trace/trace_stack.c
-@@ -120,6 +120,13 @@ check_stack(unsigned long ip, unsigned l
-       }
- 
-       /*
-+       * Some archs may not have the passed in ip in the dump.
-+       * If that happens, we need to show everything.
-+       */
-+      if (i == stack_trace_max.nr_entries)
-+              i = 0;
-+
-+      /*
-        * Now find where in the stack these are.
-        */
-       x = 0;