projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 2c527dced1eac9c66c52cf436294c6fa20d91573..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 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" },
{ "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-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" },
/* LTTng kernel tracer probe modules list */
struct kern_modules_param kern_modules_probes_default[] = {
{ "lttng-probe-asoc" },
@@
-134,9
+124,6
@@
static void modprobe_remove_lttng(const struct kern_modules_param *modules,
*/
void modprobe_remove_lttng_control(void)
{
*/
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);
modprobe_remove_lttng(kern_modules_control_core,
ARRAY_SIZE(kern_modules_control_core),
LTTNG_MOD_REQUIRED);
@@
-303,11
+290,6
@@
int modprobe_lttng_control(void)
ret = modprobe_lttng(kern_modules_control_core,
ARRAY_SIZE(kern_modules_control_core),
LTTNG_MOD_REQUIRED);
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;
}
return ret;
}
This page took
0.023819 seconds
and
4
git commands to generate.