[GIT PULL] tracing: Minor fixes

[Steven Rostedt]

Linus,

This includes three minor fixes, mostly due to cut-and-paste issues.

The first is a cut and paste issue that changed the amount of stack
to skip when tracing a stack dump from 0 to 6, which basically made
the stack disappear for small stack traces.

The second fix is just removing an unused field in a struct that is no
longer used, and currently just wastes space.

The third is another cut-and-paste fix that had a tracepoint recording
the wrong field (it was recording the previous field a second time).


Please pull the latest trace-v4.5-rc1 tree, which can be found at:


  git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
trace-v4.5-rc1

Tag SHA1: bec74fc4f2f54201168e16545bfd4d940cfb0ffd
Head SHA1: 7fd13615992ae0fc132c9abb24511be43f3b5d9d


Dmitry Safonov (1):
      ftrace: Remove unused nr_trampolines var

Gustavo Padovan (1):
      tracing/dma-buf/fence: Fix timeline str value on fence_annotate_wait_on

Steven Rostedt (Red Hat) (1):
      tracing: Fix stacktrace skip depth in trace_buffer_unlock_commit_regs()

----
 include/linux/ftrace.h       | 1 -
 include/trace/events/fence.h | 2 +-
 kernel/trace/trace.c         | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)
---------------------------
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index 60048c50404e..65460ad93c7b 100644
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -164,7 +164,6 @@ struct ftrace_ops {
 	ftrace_func_t			saved_func;
 	int __percpu			*disabled;
 #ifdef CONFIG_DYNAMIC_FTRACE
-	int				nr_trampolines;
 	struct ftrace_ops_hash		local_hash;
 	struct ftrace_ops_hash		*func_hash;
 	struct ftrace_ops_hash		old_hash;
diff --git a/include/trace/events/fence.h b/include/trace/events/fence.h
index 98feb1b82896..d6dfa05ba322 100644
--- a/include/trace/events/fence.h
+++ b/include/trace/events/fence.h
@@ -17,7 +17,7 @@ TRACE_EVENT(fence_annotate_wait_on,
 
 	TP_STRUCT__entry(
 		__string(driver, fence->ops->get_driver_name(fence))
-		__string(timeline, fence->ops->get_driver_name(fence))
+		__string(timeline, fence->ops->get_timeline_name(fence))
 		__field(unsigned int, context)
 		__field(unsigned int, seqno)
 
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 87fb9801bd9e..d9293402ee68 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -1751,7 +1751,7 @@ void trace_buffer_unlock_commit_regs(struct trace_array *tr,
 {
 	__buffer_unlock_commit(buffer, event);
 
-	ftrace_trace_stack(tr, buffer, flags, 6, pc, regs);
+	ftrace_trace_stack(tr, buffer, flags, 0, pc, regs);
 	ftrace_trace_userstack(buffer, flags, pc);
 }
 EXPORT_SYMBOL_GPL(trace_buffer_unlock_commit_regs);