X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=probes%2Flttng-kprobes.c;h=89cfe07364779f6a2094979b16c6f039252fac89;hb=0f034e0f5fac7dd35c19e82f1773ec293fdb2dcd;hp=96e7509c328bedb3211e3e3e3dfc4e4d6450f4a8;hpb=0d1a681e2c2521edea85e8748c7be35a60c73155;p=lttng-modules.git

diff --git a/probes/lttng-kprobes.c b/probes/lttng-kprobes.c
index 96e7509c..89cfe073 100644
--- a/probes/lttng-kprobes.c
+++ b/probes/lttng-kprobes.c
@@ -27,9 +27,9 @@ int lttng_kprobes_handler_pre(struct kprobe *p, struct pt_regs *regs)
 
 	if (!ACCESS_ONCE(chan->session->active))
 		return 0;
-	lib_ring_buffer_ctx_init(&ctx, chan->chan, NULL, sizeof(data),
+	lib_ring_buffer_ctx_init(&ctx, chan->chan, event, sizeof(data),
 				 ltt_alignof(data), -1);
-	ret = chan->ops->event_reserve(&ctx);
+	ret = chan->ops->event_reserve(&ctx, event->id);
 	if (ret < 0)
 		return 0;
 	lib_ring_buffer_align_ctx(&ctx, ltt_alignof(data));
@@ -65,12 +65,13 @@ int lttng_create_kprobe_event(const char *name, struct ltt_event *event)
 	}
 	field->name = "ip";
 	field->type.atype = atype_integer;
-	field->type.u.basic.integer.size = sizeof(unsigned long);
-	field->type.u.basic.integer.alignment = ltt_alignof(unsigned long);
-	field->type.u.basic.integer.signedness = 0;
+	field->type.u.basic.integer.size = sizeof(unsigned long) * CHAR_BIT;
+	field->type.u.basic.integer.alignment = ltt_alignof(unsigned long) * CHAR_BIT;
+	field->type.u.basic.integer.signedness = is_signed_type(unsigned long);
 	field->type.u.basic.integer.reverse_byte_order = 0;
 	field->type.u.basic.integer.base = 16;
 	field->type.u.basic.integer.encoding = lttng_encode_none;
+	desc->owner = THIS_MODULE;
 	event->desc = desc;
 
 	return 0;
@@ -135,12 +136,17 @@ EXPORT_SYMBOL_GPL(lttng_kprobes_register);
 void lttng_kprobes_unregister(struct ltt_event *event)
 {
 	unregister_kprobe(&event->u.kprobe.kp);
+}
+EXPORT_SYMBOL_GPL(lttng_kprobes_unregister);
+
+void lttng_kprobes_destroy_private(struct ltt_event *event)
+{
 	kfree(event->u.kprobe.symbol_name);
 	kfree(event->desc->fields);
 	kfree(event->desc->name);
 	kfree(event->desc);
 }
-EXPORT_SYMBOL_GPL(lttng_kprobes_unregister);
+EXPORT_SYMBOL_GPL(lttng_kprobes_destroy_private);
 
 MODULE_LICENSE("GPL and additional rights");
 MODULE_AUTHOR("Mathieu Desnoyers");