diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-11 16:39:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-11 16:39:18 -0800 |
| commit | 61a75954034f951a77d58b1cfb9186c62e6abcf8 (patch) | |
| tree | 4cef540d1c86bbc673a6246d6733c56d950b414b /init/Kconfig | |
| parent | 0a679e13ea30f85a1aef0669ee0c5a9fd7860b34 (diff) | |
| parent | 7276531d4036f5db2af15c8b6caa02e7741f5d80 (diff) | |
| download | blackbird-op-linux-61a75954034f951a77d58b1cfb9186c62e6abcf8.tar.gz blackbird-op-linux-61a75954034f951a77d58b1cfb9186c62e6abcf8.zip | |
Merge tag 'trace-v5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing fixes from Steven Rostedt:
"Various fixes:
- Fix an uninitialized variable
- Fix compile bug to bootconfig userspace tool (in tools directory)
- Suppress some error messages of bootconfig userspace tool
- Remove unneded CONFIG_LIBXBC from bootconfig
- Allocate bootconfig xbc_nodes dynamically. To ease complaints about
taking up static memory at boot up
- Use of parse_args() to parse bootconfig instead of strstr() usage
Prevents issues of double quotes containing the interested string
- Fix missing ring_buffer_nest_end() on synthetic event error path
- Return zero not -EINVAL on soft disabled synthetic event (soft
disabling must be the same as hard disabling, which returns zero)
- Consolidate synthetic event code (remove duplicate code)"
* tag 'trace-v5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
tracing: Consolidate trace() functions
tracing: Don't return -EINVAL when tracing soft disabled synth events
tracing: Add missing nest end to synth_event_trace_start() error case
tools/bootconfig: Suppress non-error messages
bootconfig: Allocate xbc_nodes array dynamically
bootconfig: Use parse_args() to find bootconfig and '--'
tracing/kprobe: Fix uninitialized variable bug
bootconfig: Remove unneeded CONFIG_LIBXBC
tools/bootconfig: Fix wrong __VA_ARGS__ usage
Diffstat (limited to 'init/Kconfig')
| -rw-r--r-- | init/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig index cfee56c151f1..452bc1835cd4 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1227,7 +1227,6 @@ endif config BOOT_CONFIG bool "Boot config support" depends on BLK_DEV_INITRD - select LIBXBC default y help Extra boot config allows system admin to pass a config file as |
