Merge tag 'net-6.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[thirdparty/linux.git] / lib / test_fprobe.c

diff --git a/lib/test_fprobe.c b/lib/test_fprobe.c
index 079435a2e26c42aaf7a331cc58bcc3278520ceaa..24de0e5ff85998c9d927719f4452b129e1cc0e62 100644 (file)
--- a/lib/test_fprobe.c
+++ b/lib/test_fprobe.c
@@ -39,7 +39,8 @@ static noinline u32 fprobe_selftest_nest_target(u32 value, u32 (*nest)(u32))
 }
 
 static notrace int fp_entry_handler(struct fprobe *fp, unsigned long ip,
-                                    struct pt_regs *regs, void *data)
+                                   unsigned long ret_ip,
+                                   struct pt_regs *regs, void *data)
 {
        KUNIT_EXPECT_FALSE(current_test, preemptible());
        /* This can be called on the fprobe_selftest_target and the fprobe_selftest_target2 */
@@ -57,6 +58,7 @@ static notrace int fp_entry_handler(struct fprobe *fp, unsigned long ip,
 }
 
 static notrace void fp_exit_handler(struct fprobe *fp, unsigned long ip,
+                                   unsigned long ret_ip,
                                    struct pt_regs *regs, void *data)
 {
        unsigned long ret = regs_return_value(regs);
@@ -78,14 +80,16 @@ static notrace void fp_exit_handler(struct fprobe *fp, unsigned long ip,
 }
 
 static notrace int nest_entry_handler(struct fprobe *fp, unsigned long ip,
-                                    struct pt_regs *regs, void *data)
+                                     unsigned long ret_ip,
+                                     struct pt_regs *regs, void *data)
 {
        KUNIT_EXPECT_FALSE(current_test, preemptible());
        return 0;
 }
 
 static notrace void nest_exit_handler(struct fprobe *fp, unsigned long ip,
-                                   struct pt_regs *regs, void *data)
+                                     unsigned long ret_ip,
+                                     struct pt_regs *regs, void *data)
 {
        KUNIT_EXPECT_FALSE(current_test, preemptible());
        KUNIT_EXPECT_EQ(current_test, ip, target_nest_ip);