dtrace: remove a few obsolete probes

The handle_sysrq, init_module and delete_module probes were for testing purposes
only.

Signed-off-by: Kris Van Hees <kris.van.hees@oracle.com>

diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
index 8d659c381eaa77d4b421be691d2a1cec1174b648..843f2cdc280b9d178d09469eb0363658d6a69805 100644 (file)
--- a/drivers/tty/sysrq.c
+++ b/drivers/tty/sysrq.c
@@ -32,7 +32,6 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/suspend.h>
-#include <linux/sdt.h>
 #include <linux/writeback.h>
 #include <linux/swap.h>
 #include <linux/spinlock.h>
@@ -528,9 +527,6 @@ void __handle_sysrq(int key, bool check_mask)
        pr_info("SysRq : ");
 
         op_p = __sysrq_get_key_op(key);
-       DTRACE_PROBE3(__handle_sysrq,
-               int, key, int, check_mask,
-               int, orig_log_level);
         if (op_p) {
                /*
                 * Should we check for enabled operations (/proc/sysrq-trigger

diff --git a/kernel/module.c b/kernel/module.c
index c55b12485b4341bb08ec6b122075e70484e892ed..be8c504975e83b1439f0e50175617b2329347228 100644 (file)
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -46,7 +46,6 @@
 #include <linux/string.h>
 #include <linux/mutex.h>
 #include <linux/rculist.h>
-#include <linux/sdt.h>
 #include <asm/uaccess.h>
 #include <asm/cacheflush.h>
 #include <asm/mmu_context.h>
@@ -798,10 +797,6 @@ SYSCALL_DEFINE2(delete_module, const char __user *, name_user,
        char name[MODULE_NAME_LEN];
        int ret, forced = 0;
 
-       DTRACE_PROBE2(delete_module,
-               const char __user *, name_user,
-               unsigned int, flags);
-
        if (!capable(CAP_SYS_MODULE) || modules_disabled)
                return -EPERM;
 
@@ -3416,10 +3411,6 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
        int err;
        struct load_info info = { };
 
-       DTRACE_PROBE3(init_module,
-               void __user *, umod,
-               unsigned long, len, const char __user *, uargs);
-
        err = may_init_module();
        if (err)
                return err;