diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-14 20:06:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-14 20:06:29 -0800 |
| commit | cdaed110311d45cdbefbb9a23a2d1774717b7b71 (patch) | |
| tree | 33b36bd86753ab5409a280aba4ff8dab04292d14 /tools | |
| parent | 146620506274bd24d52fb1c589110a30eed8240b (diff) | |
| parent | 55ed4560774d81d7343223b8fd2784c530a9c6c1 (diff) | |
| download | linux-stable-cdaed110311d45cdbefbb9a23a2d1774717b7b71.tar.gz linux-stable-cdaed110311d45cdbefbb9a23a2d1774717b7b71.tar.bz2 linux-stable-cdaed110311d45cdbefbb9a23a2d1774717b7b71.zip | |
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
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/bootconfig/scripts/bconf2ftrace.sh | 1 | ||||
| -rwxr-xr-x | tools/bootconfig/scripts/ftrace2bconf.sh | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/tools/bootconfig/scripts/bconf2ftrace.sh b/tools/bootconfig/scripts/bconf2ftrace.sh index 595e164dc352..feb30c2c7881 100755 --- a/tools/bootconfig/scripts/bconf2ftrace.sh +++ b/tools/bootconfig/scripts/bconf2ftrace.sh @@ -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 diff --git a/tools/bootconfig/scripts/ftrace2bconf.sh b/tools/bootconfig/scripts/ftrace2bconf.sh index 6c0d4b61e0c2..a0c3bcc6da4f 100755 --- a/tools/bootconfig/scripts/ftrace2bconf.sh +++ b/tools/bootconfig/scripts/ftrace2bconf.sh @@ -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 |