diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-07-12 16:17:40 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-07-12 16:17:40 -0700 |
commit | b047602d579b4fb028128a525f056bbdc890e7f0 (patch) | |
tree | e3dac342d77e53bb5681135b49a43ff100ef9cd0 /samples/fprobe | |
parent | 72a8e05d4f66b5af7854df4490e3135168694b6b (diff) | |
parent | 1e1fb420fe68d9d938db360fec700dfd230cc22a (diff) | |
download | linux-stable-b047602d579b4fb028128a525f056bbdc890e7f0.tar.gz linux-stable-b047602d579b4fb028128a525f056bbdc890e7f0.tar.bz2 linux-stable-b047602d579b4fb028128a525f056bbdc890e7f0.zip |
Merge tag 'trace-v5.19-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing fixes from Steven Rostedt:
"Fixes and minor clean ups for tracing:
- Fix memory leak by reverting what was thought to be a double free.
A static tool had gave a false positive that a double free was
possible in the error path, but it was actually a different
location that confused the static analyzer (and those of us that
reviewed it).
- Move use of static buffers by ftrace_dump() to a location that can
be used by kgdb's ftdump(), as it needs it for the same reasons.
- Clarify in the Kconfig description that function tracing has
negligible impact on x86, but may have a bit bigger impact on other
architectures.
- Remove unnecessary extra semicolon in trace event.
- Make a local variable static that is used in the fprobes sample
- Use KSYM_NAME_LEN for length of function in kprobe sample and get
rid of unneeded macro for the same purpose"
* tag 'trace-v5.19-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
samples: Use KSYM_NAME_LEN for kprobes
fprobe/samples: Make sample_probe static
blk-iocost: tracing: atomic64_read(&ioc->vtime_rate) is assigned an extra semicolon
ftrace: Be more specific about arch impact when function tracer is enabled
tracing: Fix sleeping while atomic in kdb ftdump
tracing/histograms: Fix memory leak problem
Diffstat (limited to 'samples/fprobe')
-rw-r--r-- | samples/fprobe/fprobe_example.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/samples/fprobe/fprobe_example.c b/samples/fprobe/fprobe_example.c index 18b1e5c4b431..e22da8573116 100644 --- a/samples/fprobe/fprobe_example.c +++ b/samples/fprobe/fprobe_example.c @@ -20,7 +20,7 @@ #define BACKTRACE_DEPTH 16 #define MAX_SYMBOL_LEN 4096 -struct fprobe sample_probe; +static struct fprobe sample_probe; static unsigned long nhit; static char symbol[MAX_SYMBOL_LEN] = "kernel_clone"; |