Fix calibrate: add noinline

[lttng-modules.git] / ltt-debugfs-abi.c

diff --git a/ltt-debugfs-abi.c b/ltt-debugfs-abi.c
index fe5f5b1b354310ea0c083cb53c3504aae7c875c9..0b8a60a2698d7901e6c86c4f391149f6d5225098 100644 (file)
--- a/ltt-debugfs-abi.c
+++ b/ltt-debugfs-abi.c
@@ -220,6 +220,20 @@ long lttng_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
        case LTTNG_KERNEL_WAIT_QUIESCENT:
                synchronize_trace();
                return 0;
+       case LTTNG_KERNEL_CALIBRATE:
+       {
+               struct lttng_kernel_calibrate __user *ucalibrate =
+                       (struct lttng_kernel_calibrate __user *) arg;
+               struct lttng_kernel_calibrate calibrate;
+               int ret;
+
+               if (copy_from_user(&calibrate, ucalibrate, sizeof(calibrate)))
+                       return -EFAULT;
+               ret = lttng_calibrate(&calibrate);
+               if (copy_to_user(ucalibrate, &calibrate, sizeof(calibrate)))
+                       return -EFAULT;
+               return ret;
+       }
        default:
                return -ENOIOCTLCMD;
        }
@@ -488,6 +502,9 @@ int lttng_abi_create_event(struct file *channel_file,
                return -EFAULT;
        event_param.name[LTTNG_SYM_NAME_LEN - 1] = '\0';
        switch (event_param.instrumentation) {
+       case LTTNG_KERNEL_KRETPROBE:
+               event_param.u.kretprobe.symbol_name[LTTNG_SYM_NAME_LEN - 1] = '\0';
+               break;
        case LTTNG_KERNEL_KPROBE:
                event_param.u.kprobe.symbol_name[LTTNG_SYM_NAME_LEN - 1] = '\0';
                break;