X-Git-Url: http://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmodprobe.c;h=28385ea39e6affd19e30627b97411c8fa2817a99;hp=e1f52afd972b48aab29df0a6ac9a9d33f7b47c19;hb=50e0fa5f7abf4f70ffaafc65309f3509897d84c4;hpb=adfe4f5ee4088878b68135a4bd64e7260f2330ba

diff --git a/src/bin/lttng-sessiond/modprobe.c b/src/bin/lttng-sessiond/modprobe.c
index e1f52afd9..28385ea39 100644
--- a/src/bin/lttng-sessiond/modprobe.c
+++ b/src/bin/lttng-sessiond/modprobe.c
@@ -52,6 +52,10 @@ struct kern_modules_param kern_modules_control_core[] = {
 		.name = (char *) "lttng-ring-buffer-metadata-mmap-client",
 		.load_policy = KERNEL_MODULE_PROPERTY_LOAD_POLICY_REQUIRED,
 	},
+	{
+		.name = (char *) "lttng-ring-buffer-event_notifier-client",
+		.load_policy = KERNEL_MODULE_PROPERTY_LOAD_POLICY_OPTIONAL,
+	},
 };
 
 /* LTTng kerneltracer probe modules list */
@@ -621,7 +625,7 @@ static int append_list_to_probes(const char *list)
 {
 	char *next;
 	int ret;
-	char *tmp_list, *cur_list;
+	char *tmp_list, *cur_list, *saveptr;
 
 	assert(list);
 
@@ -635,7 +639,7 @@ static int append_list_to_probes(const char *list)
 		size_t name_len;
 		struct kern_modules_param *cur_mod;
 
-		next = strtok(cur_list, ",");
+		next = strtok_r(cur_list, ",", &saveptr);
 		if (!next) {
 			break;
 		}