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

diff --git a/src/bin/lttng-sessiond/modprobe.c b/src/bin/lttng-sessiond/modprobe.c
index 05027404e..66e80e75b 100644
--- a/src/bin/lttng-sessiond/modprobe.c
+++ b/src/bin/lttng-sessiond/modprobe.c
@@ -1,19 +1,9 @@
 /*
- * Copyright (C) 2011 - David Goulet <dgoulet@efficios.com>
- *               2014 - Jan Glauber <jan.glauber@gmail.com>
+ * Copyright (C) 2011 David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2014 Jan Glauber <jan.glauber@gmail.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /**
@@ -34,6 +24,7 @@
 
 #include "modprobe.h"
 #include "kern-modules.h"
+#include "lttng-sessiond.h"
 
 #define LTTNG_MOD_REQUIRED	1
 #define LTTNG_MOD_OPTIONAL	0
@@ -70,6 +61,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 +335,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 +560,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 +595,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) {