X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fprobes%2Flttng-kprobes.c;h=01bc16e4e534cf6c5f02544455252f3df192eb32;hb=d96a4a7a78319be3386b57d9068817e9ffac2a24;hp=6824088c3d752d9f38b754894fae3cab932d6d9a;hpb=99d223adfae9b68800e91bda470c92acb14efae6;p=lttng-modules.git

diff --git a/src/probes/lttng-kprobes.c b/src/probes/lttng-kprobes.c
index 6824088c..01bc16e4 100644
--- a/src/probes/lttng-kprobes.c
+++ b/src/probes/lttng-kprobes.c
@@ -54,11 +54,13 @@ int lttng_kprobes_event_notifier_handler_pre(struct kprobe *p, struct pt_regs *r
 {
 	struct lttng_event_notifier *event_notifier =
 		container_of(p, struct lttng_event_notifier, u.kprobe.kp);
+	struct lttng_kernel_notifier_ctx notif_ctx;
 
 	if (unlikely(!READ_ONCE(event_notifier->enabled)))
 		return 0;
 
-	event_notifier->send_notification(event_notifier, NULL, NULL);
+	notif_ctx.eval_capture = LTTNG_READ_ONCE(event_notifier->eval_capture);
+	event_notifier->send_notification(event_notifier, NULL, NULL, &notif_ctx);
 
 	return 0;
 }
@@ -89,13 +91,13 @@ int lttng_create_kprobe_event(const char *name, struct lttng_event *event)
 		goto error_field;
 	}
 	field->name = "ip";
-	field->type.atype = atype_integer;
+	field->type.type = lttng_kernel_type_integer;
 	field->type.u.integer.size = sizeof(unsigned long) * CHAR_BIT;
 	field->type.u.integer.alignment = lttng_alignof(unsigned long) * CHAR_BIT;
 	field->type.u.integer.signedness = lttng_is_signed_type(unsigned long);
 	field->type.u.integer.reverse_byte_order = 0;
 	field->type.u.integer.base = 16;
-	field->type.u.integer.encoding = lttng_encode_none;
+	field->type.u.integer.encoding = lttng_kernel_string_encoding_none;
 	desc->owner = THIS_MODULE;
 	event->desc = desc;
 
@@ -170,7 +172,7 @@ int _lttng_kprobes_register(const char *symbol_name,
 	lttng_kp->kp.addr = (void *) (unsigned long) addr;
 
 	/*
-	 * Ensure the memory we just allocated don't event_notifier page faults.
+	 * Ensure the memory we just allocated don't notify page faults.
 	 * Well.. kprobes itself puts the page fault handler on the blacklist,
 	 * but we can never be too careful.
 	 */