Calibrate namespacing

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/ltt-debugfs-abi.c b/ltt-debugfs-abi.c
index 31465d83ef6d759edb6462453fe484bd09bf0279..0b8a60a2698d7901e6c86c4f391149f6d5225098 100644 (file)
--- a/ltt-debugfs-abi.c
+++ b/ltt-debugfs-abi.c
@@ -222,9 +222,9 @@ long lttng_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                return 0;
        case LTTNG_KERNEL_CALIBRATE:
        {
-               struct lttng_calibrate __user *ucalibrate =
-                       (struct lttng_calibrate __user *) arg;
-               struct lttng_calibrate 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)))

diff --git a/ltt-debugfs-abi.h b/ltt-debugfs-abi.h
index f041476f259696a58c55d3de27f41cdc8e9f9599..f7e643132622b6c809dd9530ff7f05264dcf7608 100644 (file)
--- a/ltt-debugfs-abi.h
+++ b/ltt-debugfs-abi.h
@@ -81,12 +81,12 @@ struct lttng_kernel_tracer_version {
        uint32_t sublevel;
 };
 
-enum lttng_calibrate_type {
-       LTTNG_CALIBRATE_KRETPROBE,
+enum lttng_kernel_calibrate_type {
+       LTTNG_KERNEL_CALIBRATE_KRETPROBE,
 };
 
-struct lttng_calibrate {
-       enum lttng_calibrate_type type; /* type (input) */
+struct lttng_kernel_calibrate {
+       enum lttng_kernel_calibrate_type type;  /* type (input) */
 };
 
 enum lttng_kernel_context_type {
@@ -122,7 +122,7 @@ struct lttng_kernel_context {
 #define LTTNG_KERNEL_TRACEPOINT_LIST           _IO(0xF6, 0x42)
 #define LTTNG_KERNEL_WAIT_QUIESCENT            _IO(0xF6, 0x43)
 #define LTTNG_KERNEL_CALIBRATE                 \
-       _IOWR(0xF6, 0x44, struct lttng_calibrate)
+       _IOWR(0xF6, 0x44, struct lttng_kernel_calibrate)
 
 /* Session FD ioctl */
 #define LTTNG_KERNEL_METADATA                  \

diff --git a/ltt-events.h b/ltt-events.h
index 525fc982cbaf3b629e295d0da779a9c8927bc6f1..94ce295b58cb272f69d9cbe66bb665d99c0eced1 100644 (file)
--- a/ltt-events.h
+++ b/ltt-events.h
@@ -415,7 +415,7 @@ void lttng_ftrace_destroy_private(struct ltt_event *event)
 }
 #endif
 
-int lttng_calibrate(struct lttng_calibrate *calibrate);
+int lttng_calibrate(struct lttng_kernel_calibrate *calibrate);
 
 extern const struct file_operations lttng_tracepoint_list_fops;
 

diff --git a/lttng-calibrate.c b/lttng-calibrate.c
index 0bf413d461d18c8ab3397143f31ee48a9b07ab9a..421d027b26fc7b93af4d2f5a8ead373231dfaa78 100644 (file)
--- a/lttng-calibrate.c
+++ b/lttng-calibrate.c
@@ -16,10 +16,10 @@ void lttng_calibrate_kretprobe(void)
        asm volatile ("");
 }
 
-int lttng_calibrate(struct lttng_calibrate *calibrate)
+int lttng_calibrate(struct lttng_kernel_calibrate *calibrate)
 {
        switch (calibrate->type) {
-       case LTTNG_CALIBRATE_KRETPROBE:
+       case LTTNG_KERNEL_CALIBRATE_KRETPROBE:
                lttng_calibrate_kretprobe();
                break;
        default: