Commit cdaed110 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'trace-v5.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace 

Pull bootconfig fix from Steven Rostedt:
 "Update bootconf scripts for tracing_on option

  The tracing_on option is supported by bootconfig entries, but the
  scripts to convert from ftrace to a bootconfig and back were not
  updated"

* tag 'trace-v5.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tools/bootconfig: Add tracing_on support to helper scripts
parents 14662050 55ed4560

tools/bootconfig/scripts/bconf2ftrace.sh

+1 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ setup_instance() { # [instance] 
	set_array_of ${instance}.options ${instancedir}/trace_options

	set_value_of ${instance}.trace_clock ${instancedir}/trace_clock

	set_value_of ${instance}.cpumask ${instancedir}/tracing_cpumask

	set_value_of ${instance}.tracing_on ${instancedir}/tracing_on

	set_value_of ${instance}.tracer ${instancedir}/current_tracer

	set_array_of ${instance}.ftrace.filters \

		${instancedir}/set_ftrace_filter

tools/bootconfig/scripts/ftrace2bconf.sh

+4 −0
Original line number Diff line number Diff line
@@ -221,6 +221,10 @@ instance_options() { # [instance-name] 
	if [ `echo $val | sed -e s/f//g`x != x ]; then

		emit_kv $PREFIX.cpumask = $val

	fi

	val=`cat $INSTANCE/tracing_on`

	if [ `echo $val | sed -e s/f//g`x != x ]; then

		emit_kv $PREFIX.tracing_on = $val

	fi



	val=

	for i in `cat $INSTANCE/set_event`; do