Merge tag 'v4.15-rc1' into drm-misc-fixes

[sfrench/cifs-2.6.git] / kernel / trace / trace_probe.c

diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c
index 52478f033f88f2d38315c887406608554c391a32..d5935730867709232f547fd08ef6a3659ea819c9 100644 (file)
--- a/kernel/trace/trace_probe.c
+++ b/kernel/trace/trace_probe.c
@@ -623,92 +623,6 @@ void traceprobe_free_probe_arg(struct probe_arg *arg)
        kfree(arg->comm);
 }
 
-int traceprobe_command(const char *buf, int (*createfn)(int, char **))
-{
-       char **argv;
-       int argc, ret;
-
-       argc = 0;
-       ret = 0;
-       argv = argv_split(GFP_KERNEL, buf, &argc);
-       if (!argv)
-               return -ENOMEM;
-
-       if (argc)
-               ret = createfn(argc, argv);
-
-       argv_free(argv);
-
-       return ret;
-}
-
-#define WRITE_BUFSIZE  4096
-
-ssize_t traceprobe_probes_write(struct file *file, const char __user *buffer,
-                               size_t count, loff_t *ppos,
-                               int (*createfn)(int, char **))
-{
-       char *kbuf, *buf, *tmp;
-       int ret = 0;
-       size_t done = 0;
-       size_t size;
-
-       kbuf = kmalloc(WRITE_BUFSIZE, GFP_KERNEL);
-       if (!kbuf)
-               return -ENOMEM;
-
-       while (done < count) {
-               size = count - done;
-
-               if (size >= WRITE_BUFSIZE)
-                       size = WRITE_BUFSIZE - 1;
-
-               if (copy_from_user(kbuf, buffer + done, size)) {
-                       ret = -EFAULT;
-                       goto out;
-               }
-               kbuf[size] = '\0';
-               buf = kbuf;
-               do {
-                       tmp = strchr(buf, '\n');
-                       if (tmp) {
-                               *tmp = '\0';
-                               size = tmp - buf + 1;
-                       } else {
-                               size = strlen(buf);
-                               if (done + size < count) {
-                                       if (buf != kbuf)
-                                               break;
-                                       /* This can accept WRITE_BUFSIZE - 2 ('\n' + '\0') */
-                                       pr_warn("Line length is too long: Should be less than %d\n",
-                                               WRITE_BUFSIZE - 2);
-                                       ret = -EINVAL;
-                                       goto out;
-                               }
-                       }
-                       done += size;
-
-                       /* Remove comments */
-                       tmp = strchr(buf, '#');
-
-                       if (tmp)
-                               *tmp = '\0';
-
-                       ret = traceprobe_command(buf, createfn);
-                       if (ret)
-                               goto out;
-                       buf += size;
-
-               } while (done < count);
-       }
-       ret = done;
-
-out:
-       kfree(kbuf);
-
-       return ret;
-}
-
 static int __set_print_fmt(struct trace_probe *tp, char *buf, int len,
                           bool is_return)
 {