Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+5
+1
tools/bootconfig/scripts/bconf2ftrace.sh
··· 152 152 set_array_of ${instance}.options ${instancedir}/trace_options 153 153 set_value_of ${instance}.trace_clock ${instancedir}/trace_clock 154 154 set_value_of ${instance}.cpumask ${instancedir}/tracing_cpumask 155 + set_value_of ${instance}.tracing_on ${instancedir}/tracing_on 155 156 set_value_of ${instance}.tracer ${instancedir}/current_tracer 156 157 set_array_of ${instance}.ftrace.filters \ 157 158 ${instancedir}/set_ftrace_filter
+4
tools/bootconfig/scripts/ftrace2bconf.sh
··· 221 221 if [ `echo $val | sed -e s/f//g`x != x ]; then 222 222 emit_kv $PREFIX.cpumask = $val 223 223 fi 224 + val=`cat $INSTANCE/tracing_on` 225 + if [ `echo $val | sed -e s/f//g`x != x ]; then 226 + emit_kv $PREFIX.tracing_on = $val 227 + fi 224 228 225 229 val= 226 230 for i in `cat $INSTANCE/set_event`; do