X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmodprobe.c;h=d63483481369436f5d639463c7832caa5f9de9a7;hp=05027404e42587cc9abbe34c57c4f8722a68a127;hb=46440d0ccf65b098757389ffebb0f7452626c4a3;hpb=4ad664a014c19a1d9e113724ac0506367d3004c4

diff --git a/src/bin/lttng-sessiond/modprobe.c b/src/bin/lttng-sessiond/modprobe.c
index 05027404e..d63483481 100644
--- a/src/bin/lttng-sessiond/modprobe.c
+++ b/src/bin/lttng-sessiond/modprobe.c
@@ -34,6 +34,7 @@
 
 #include "modprobe.h"
 #include "kern-modules.h"
+#include "lttng-sessiond.h"
 
 #define LTTNG_MOD_REQUIRED	1
 #define LTTNG_MOD_OPTIONAL	0
@@ -70,6 +71,7 @@ struct kern_modules_param kern_modules_probes_default[] = {
 	{ "lttng-probe-napi" },
 	{ "lttng-probe-net" },
 	{ "lttng-probe-power" },
+	{ "lttng-probe-preemptirq" },
 	{ "lttng-probe-printk" },
 	{ "lttng-probe-random" },
 	{ "lttng-probe-rcu" },
@@ -343,7 +345,7 @@ static int modprobe_lttng(struct kern_modules_param *modules,
 			}
 		} else {
 			DBG("Modprobe successfully %s", modules[i].name);
-			modules[i].loaded;
+			modules[i].loaded = true;
 		}
 	}
 
@@ -568,12 +570,7 @@ int modprobe_lttng_data(void)
 	 * Base probes: either from command line option, environment
 	 * variable or default list.
 	 */
-	if (kmod_probes_list) {
-		list = kmod_probes_list;
-	} else {
-		list = utils_get_kmod_probes_list();
-	}
-
+	list = config.kmod_probes_list.value;
 	if (list) {
 		/* User-specified probes. */
 		ret = append_list_to_probes(list);
@@ -608,12 +605,7 @@ int modprobe_lttng_data(void)
 	/*
 	 * Extra modules? Append them to current probes list.
 	 */
-	if (kmod_extra_probes_list) {
-		list = kmod_extra_probes_list;
-	} else {
-		list = utils_get_extra_kmod_probes_list();
-	}
-
+	list = config.kmod_extra_probes_list.value;
 	if (list) {
 		ret = append_list_to_probes(list);
 		if (ret) {