Drop optional control modules load and unload

[lttng-tools.git] / src / bin / lttng-sessiond / modprobe.c

diff --git a/src/bin/lttng-sessiond/modprobe.c b/src/bin/lttng-sessiond/modprobe.c
index 8603d048624c6a7db75dbed1f04107d001fcbcbe..81ce8105a220be9568618ac07ceb032811432127 100644 (file)
--- a/src/bin/lttng-sessiond/modprobe.c
+++ b/src/bin/lttng-sessiond/modprobe.c
@@ -33,8 +33,6 @@
 
 /* LTTng kernel tracer mandatory core modules list */
 struct kern_modules_param kern_modules_control_core[] = {
-       { "lttng-tracer" },     /* MUST be loaded first so keep at top */
-       { "lttng-lib-ring-buffer" },
        { "lttng-ring-buffer-client-discard" },
        { "lttng-ring-buffer-client-overwrite" },
        { "lttng-ring-buffer-metadata-client" },
@@ -43,14 +41,6 @@ struct kern_modules_param kern_modules_control_core[] = {
        { "lttng-ring-buffer-metadata-mmap-client" },
 };
 
-/* LTTng kernel tracer optional base modules list */
-struct kern_modules_param kern_modules_control_opt[] = {
-       { "lttng-types" },
-       { "lttng-ftrace" },
-       { "lttng-kprobes" },
-       { "lttng-kretprobes" },
-};
-
 /* LTTng kernel tracer probe modules list */
 struct kern_modules_param kern_modules_probes_default[] = {
        { "lttng-probe-asoc" },
@@ -92,6 +82,7 @@ struct kern_modules_param kern_modules_probes_default[] = {
        { "lttng-probe-workqueue" },
        { "lttng-probe-writeback" },
        { "lttng-probe-x86-irq-vectors" },
+       { "lttng-probe-x86-exceptions" },
 };
 
 /* dynamic probe modules list */
@@ -133,9 +124,6 @@ static void modprobe_remove_lttng(const struct kern_modules_param *modules,
  */
 void modprobe_remove_lttng_control(void)
 {
-       modprobe_remove_lttng(kern_modules_control_opt,
-                             ARRAY_SIZE(kern_modules_control_opt),
-                             LTTNG_MOD_OPTIONAL);
        modprobe_remove_lttng(kern_modules_control_core,
                              ARRAY_SIZE(kern_modules_control_core),
                              LTTNG_MOD_REQUIRED);
@@ -302,11 +290,6 @@ int modprobe_lttng_control(void)
        ret = modprobe_lttng(kern_modules_control_core,
                             ARRAY_SIZE(kern_modules_control_core),
                             LTTNG_MOD_REQUIRED);
-       if (ret != 0)
-               return ret;
-       ret = modprobe_lttng(kern_modules_control_opt,
-                            ARRAY_SIZE(kern_modules_control_opt),
-                            LTTNG_MOD_OPTIONAL);
        return ret;
 }