X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=probes%2Flttng-ftrace.c;h=7c4fc9f55d78f5fc98898cd45af8a630b37e90ae;hb=64c796d8aec1efa5d6f0d5850d2a0095cb7842e3;hp=061da25a1475bceda81c48facd6570d27a37bdf1;hpb=0d1a681e2c2521edea85e8748c7be35a60c73155;p=lttng-modules.git

diff --git a/probes/lttng-ftrace.c b/probes/lttng-ftrace.c
index 061da25a..7c4fc9f5 100644
--- a/probes/lttng-ftrace.c
+++ b/probes/lttng-ftrace.c
@@ -38,7 +38,7 @@ void lttng_ftrace_handler(unsigned long ip, unsigned long parent_ip, void **data
 		return;
 	lib_ring_buffer_ctx_init(&ctx, chan->chan, NULL,
 				 sizeof(payload), ltt_alignof(payload), -1);
-	ret = chan->ops->event_reserve(&ctx);
+	ret = chan->ops->event_reserve(&ctx, event->id);
 	if (ret < 0)
 		return;
 	payload.ip = ip;
@@ -76,8 +76,8 @@ int lttng_create_ftrace_event(const char *name, struct ltt_event *event)
 	}
 	fields[0].name = "ip";
 	fields[0].type.atype = atype_integer;
-	fields[0].type.u.basic.integer.size = sizeof(unsigned long);
-	fields[0].type.u.basic.integer.alignment = ltt_alignof(unsigned long);
+	fields[0].type.u.basic.integer.size = sizeof(unsigned long) * CHAR_BIT;
+	fields[0].type.u.basic.integer.alignment = ltt_alignof(unsigned long) * CHAR_BIT;
 	fields[0].type.u.basic.integer.signedness = 0;
 	fields[0].type.u.basic.integer.reverse_byte_order = 0;
 	fields[0].type.u.basic.integer.base = 16;
@@ -85,8 +85,8 @@ int lttng_create_ftrace_event(const char *name, struct ltt_event *event)
 
 	fields[1].name = "parent_ip";
 	fields[1].type.atype = atype_integer;
-	fields[1].type.u.basic.integer.size = sizeof(unsigned long);
-	fields[1].type.u.basic.integer.alignment = ltt_alignof(unsigned long);
+	fields[1].type.u.basic.integer.size = sizeof(unsigned long) * CHAR_BIT;
+	fields[1].type.u.basic.integer.alignment = ltt_alignof(unsigned long) * CHAR_BIT;
 	fields[1].type.u.basic.integer.signedness = 0;
 	fields[1].type.u.basic.integer.reverse_byte_order = 0;
 	fields[1].type.u.basic.integer.base = 16;
@@ -146,7 +146,7 @@ void lttng_ftrace_unregister(struct ltt_event *event)
 	wrapper_unregister_ftrace_function_probe(event->u.ftrace.symbol_name,
 			&lttng_ftrace_ops, event);
 	kfree(event->u.ftrace.symbol_name);
-	kfree(desc->fields);
+	kfree(event->desc->fields);
 	kfree(event->desc->name);
 	kfree(event->desc);
 }