diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-09-10 09:05:20 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-09-10 09:05:20 -0700 |
commit | 8d8d276ba2fb5f9ac4984f5c10ae60858090babc (patch) | |
tree | 9728da1d91543da1f74329126a48d17febae5dfb /drivers/pps/generators | |
parent | bc83b4d1f08695e85e85d36f7b803da58010161d (diff) | |
parent | 4e378158e5c15bd237a6ff44b7abb9184d61208c (diff) | |
download | linux-master.tar.gz linux-master.tar.bz2 linux-master.zip |
Merge tag 'trace-v6.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-traceHEADmaster
Pull tracing fixes from Steven Rostedt:
- Move declaration of interface_lock outside of CONFIG_TIMERLAT_TRACER
The fix to some locking races moved the declaration of the
interface_lock up in the file, but also moved it into the
CONFIG_TIMERLAT_TRACER #ifdef block, breaking the build when that
wasn't set. Move it further up and out of that #ifdef block.
- Remove unused function run_tracer_selftest() stub
When CONFIG_FTRACE_STARTUP_TEST is not set the stub function
run_tracer_selftest() is not used and clang is warning about it.
Remove the function stub as it is not needed.
* tag 'trace-v6.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
tracing: Drop unused helper function to fix the build
tracing/osnoise: Fix build when timerlat is not enabled
Diffstat (limited to 'drivers/pps/generators')
0 files changed, 0 insertions, 0 deletions