Merge tag 'trace-v4.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace (26cd8367) · Commits · 戴 / test

Pull minor tracing fixes from Steven Rostedt: "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)" * tag 'trace-v4.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: tracing/dma-buf/fence: Fix timeline str value on fence_annotate_wait_on ftrace: Remove unused nr_trampolines var tracing: Fix stacktrace skip depth in trace_buffer_unlock_commit_regs()

include/linux/ftrace.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -165,7 +165,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;

include/trace/events/fence.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)

kernel/trace/trace.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

Admin message