diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-02-24 01:27:01 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-02-24 01:27:01 +0300 |
| commit | f2b98d0af217f64b96bc549457018117ba6b7509 (patch) | |
| tree | 3b83f60d6707a810b6f4142e9ba4dd43f4cccd32 /tools | |
| parent | fcc77d7c8ef6478844547d50dd3d03270c86116c (diff) | |
| parent | 6c40624930c58529185a257380442547580ed837 (diff) | |
| download | linux-f2b98d0af217f64b96bc549457018117ba6b7509.tar.xz | |
Merge tag 'bootconfig-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace
Pull bootconfig updates from Masami Hiramatsu:
- Fix ftrace2bconf.sh tool for checking event enable status correctly
- Add CONFIG_BOOT_CONFIG_FORCE to apply bootconfig without 'bootconfig'
boot parameter
- Enable CONFIG_BOOT_CONFIG_FORCE by default if a bootconfig is
embedded in the kernel
- Increase max number of nodes of bootconfig to 8192
* tag 'bootconfig-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
bootconfig: Increase max nodes of bootconfig from 1024 to 8192 for DCC support
bootconfig: Default BOOT_CONFIG_FORCE to y if BOOT_CONFIG_EMBED
Allow forcing unconditional bootconfig processing
tools/bootconfig: fix single & used for logical condition
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/bootconfig/scripts/ftrace2bconf.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/bootconfig/scripts/ftrace2bconf.sh b/tools/bootconfig/scripts/ftrace2bconf.sh index 6183b36c6846..1603801cf126 100755 --- a/tools/bootconfig/scripts/ftrace2bconf.sh +++ b/tools/bootconfig/scripts/ftrace2bconf.sh @@ -93,7 +93,7 @@ referred_vars() { } event_is_enabled() { # enable-file - test -f $1 & grep -q "1" $1 + test -f $1 && grep -q "1" $1 } per_event_options() { # event-dir |