From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 5 Aug 2011 21:11:54 +0000 (-0400)
Subject: Calibrate namespacing
X-Git-Tag: v2.0-pre7~4
X-Git-Url: http://git.lttng.org/?a=commitdiff_plain;h=3db41b2c5d1fef77ca065dc8ef7f0fdd9c17cf32;hp=b265a505ba25418104f3425e4475f45419844e8a;p=lttng-modules.git

Calibrate namespacing

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

diff --git a/ltt-debugfs-abi.c b/ltt-debugfs-abi.c
index 31465d83..0b8a60a2 100644
--- 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 f041476f..f7e64313 100644
--- 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 525fc982..94ce295b 100644
--- 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 0bf413d4..421d027b 100644
--- 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: