diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-11-10 16:35:04 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-11-10 16:35:04 -0800 |
commit | 3ca112b71f35dd5d99fc4571a56b5fc6f0c15814 (patch) | |
tree | d57ced35a41422ed28cd3e33c40af3ea05d104e4 /include/linux | |
parent | 18553507f60f4f51f071644621a58836eb59e28c (diff) | |
parent | f032c53bea6d2057c14553832d846be2f151cfb2 (diff) | |
download | linux-stable-3ca112b71f35dd5d99fc4571a56b5fc6f0c15814.tar.gz linux-stable-3ca112b71f35dd5d99fc4571a56b5fc6f0c15814.tar.bz2 linux-stable-3ca112b71f35dd5d99fc4571a56b5fc6f0c15814.zip |
Merge tag 'probes-fixes-v6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace
Pull probes fixes from Masami Hiramatsu:
- Documentation update: Add a note about argument and return value
fetching is the best effort because it depends on the type.
- objpool: Fix to make internal global variables static in
test_objpool.c.
- kprobes: Unify kprobes_exceptions_nofify() prototypes. There are the
same prototypes in asm/kprobes.h for some architectures, but some of
them are missing the prototype and it causes a warning. So move the
prototype into linux/kprobes.h.
- tracing: Fix to check the tracepoint event and return event at
parsing stage. The tracepoint event doesn't support %return but if
$retval exists, it will be converted to %return silently. This finds
that case and rejects it.
- tracing: Fix the order of the descriptions about the parameters of
__kprobe_event_gen_cmd_start() to be consistent with the argument
list of the function.
* tag 'probes-fixes-v6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
tracing/kprobes: Fix the order of argument descriptions
tracing: fprobe-event: Fix to check tracepoint event and return
kprobes: unify kprobes_exceptions_nofify() prototypes
lib: test_objpool: make global variables static
Documentation: tracing: Add a note about argument and retval access
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/kprobes.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h index 365eb092e9c4..ab1da3142b06 100644 --- a/include/linux/kprobes.h +++ b/include/linux/kprobes.h @@ -445,6 +445,10 @@ int kprobe_get_kallsym(unsigned int symnum, unsigned long *value, char *type, int arch_kprobe_get_kallsym(unsigned int *symnum, unsigned long *value, char *type, char *sym); + +int kprobe_exceptions_notify(struct notifier_block *self, + unsigned long val, void *data); + #else /* !CONFIG_KPROBES: */ static inline int kprobe_fault_handler(struct pt_regs *regs, int trapnr) |