diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2023-07-03 03:53:03 +0200 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2023-07-03 03:53:03 +0200 |
| commit | 3fbff91afbf0148e937b8718ed865b073c587d9f (patch) | |
| tree | f69741c34579567af3d31f68737ea322d9311892 /kernel/kprobes.c | |
| parent | Merge branch 'master' into mm-hotfixes-stable (diff) | |
| parent | Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux (diff) | |
| download | linux-3fbff91afbf0148e937b8718ed865b073c587d9f.tar.xz linux-3fbff91afbf0148e937b8718ed865b073c587d9f.zip | |
Merge branch 'master' into mm-hotfixes-stable
Diffstat (limited to '')
| -rw-r--r-- | kernel/kprobes.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/kprobes.c b/kernel/kprobes.c index 00e177de91cc..ce13f1a35251 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -2127,6 +2127,7 @@ static int pre_handler_kretprobe(struct kprobe *p, struct pt_regs *regs) NOKPROBE_SYMBOL(pre_handler_kretprobe); static void kretprobe_rethook_handler(struct rethook_node *rh, void *data, + unsigned long ret_addr, struct pt_regs *regs) { struct kretprobe *rp = (struct kretprobe *)data; |