Merge tag 'for-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux...

[linux-2.6-microblaze.git] / kernel / trace / trace_kprobe.c

diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index 97c7a77..9c31f42 100644 (file)
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -25,11 +25,12 @@
 
 /* Kprobe early definition from command line */
 static char kprobe_boot_events_buf[COMMAND_LINE_SIZE] __initdata;
-static bool kprobe_boot_events_enabled __initdata;
 
 static int __init set_kprobe_boot_events(char *str)
 {
        strlcpy(kprobe_boot_events_buf, str, COMMAND_LINE_SIZE);
+       disable_tracing_selftest("running kprobe events");
+
        return 0;
 }
 __setup("kprobe_event=", set_kprobe_boot_events);
@@ -1888,8 +1889,6 @@ static __init void setup_boot_kprobe_events(void)
                ret = trace_run_command(cmd, create_or_delete_trace_kprobe);
                if (ret)
                        pr_warn("Failed to add event(%d): %s\n", ret, cmd);
-               else
-                       kprobe_boot_events_enabled = true;
 
                cmd = p;
        }
@@ -1974,10 +1973,8 @@ static __init int kprobe_trace_self_tests_init(void)
        if (tracing_is_disabled())
                return -ENODEV;
 
-       if (kprobe_boot_events_enabled) {
-               pr_info("Skipping kprobe tests due to kprobe_event on cmdline\n");
+       if (tracing_selftest_disabled)
                return 0;
-       }
 
        target = kprobe_trace_selftest_target;