Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b293907 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'trace-v4.17-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace 

Pull tracing fixes from Steven Rostedt:
 "Some of the files in the tracing directory show file mode 0444 when
  they are writable by root. To fix the confusion, they should be 0644.
  Note, either case root can still write to them.

  Zhengyuan asked why I never applied that patch (the first one is from
  2014!). I simply forgot about it. /me lowers head in shame"

* tag 'trace-v4.17-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing: Fix the file mode of stack tracer
  ftrace: Have set_graph_* files have normal file modes
parents eb4f959b 0c5a9acc

kernel/trace/ftrace.c

+2 −2
Original line number Diff line number Diff line
@@ -5514,10 +5514,10 @@ static __init int ftrace_init_dyn_tracefs(struct dentry *d_tracer) 
	ftrace_create_filter_files(&global_ops, d_tracer);



#ifdef CONFIG_FUNCTION_GRAPH_TRACER

	trace_create_file("set_graph_function", 0444, d_tracer,

	trace_create_file("set_graph_function", 0644, d_tracer,

				    NULL,

				    &ftrace_graph_fops);

	trace_create_file("set_graph_notrace", 0444, d_tracer,

	trace_create_file("set_graph_notrace", 0644, d_tracer,

				    NULL,

				    &ftrace_graph_notrace_fops);

#endif /* CONFIG_FUNCTION_GRAPH_TRACER */

kernel/trace/trace_stack.c

+1 −1
Original line number Diff line number Diff line
@@ -472,7 +472,7 @@ static __init int stack_trace_init(void) 
			NULL, &stack_trace_fops);



#ifdef CONFIG_DYNAMIC_FTRACE

	trace_create_file("stack_trace_filter", 0444, d_tracer,

	trace_create_file("stack_trace_filter", 0644, d_tracer,

			  &trace_ops, &stack_trace_filter_fops);

#endif