From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 29 Jul 2011 16:08:38 +0000 (-0400)
Subject: Update calibration
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=9b4a21cced19f3c661fdf5e08d40688ff2539ad7;p=deliverable%2Flttng-modules.git

Update calibration

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

diff --git a/ltt-debugfs-abi.h b/ltt-debugfs-abi.h
index 3a2b81f1..f041476f 100644
--- a/ltt-debugfs-abi.h
+++ b/ltt-debugfs-abi.h
@@ -87,11 +87,6 @@ enum lttng_calibrate_type {
 
 struct lttng_calibrate {
 	enum lttng_calibrate_type type;	/* type (input) */
-	union {
-		struct {
-			uint64_t addr;	/* address to probe (output) */
-		} kretprobe;
-	} u;
 };
 
 enum lttng_kernel_context_type {
diff --git a/lttng-calibrate.c b/lttng-calibrate.c
index 45c01e32..0bf413d4 100644
--- a/lttng-calibrate.c
+++ b/lttng-calibrate.c
@@ -13,13 +13,14 @@
 
 void lttng_calibrate_kretprobe(void)
 {
+	asm volatile ("");
 }
 
 int lttng_calibrate(struct lttng_calibrate *calibrate)
 {
 	switch (calibrate->type) {
 	case LTTNG_CALIBRATE_KRETPROBE:
-		calibrate->u.kretprobe.addr = &lttng_calibrate_kretprobe;
+		lttng_calibrate_kretprobe();
 		break;
 	default:
 		return -EINVAL;