projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Create a dedicated test suite for Perf
[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 3e41f5c1b6539a9eaa3af8706700c074c473c2b9..f58f50c65c3f4f8284a6bd9bf7a2af1bb548a00a 100644
(file)
--- a/
src/bin/lttng-sessiond/modprobe.c
+++ b/
src/bin/lttng-sessiond/modprobe.c
@@
-57,6
+57,7
@@
struct kern_modules_param kern_modules_probes_default[] = {
{ "lttng-probe-ext3" },
{ "lttng-probe-ext4" },
{ "lttng-probe-gpio" },
{ "lttng-probe-ext3" },
{ "lttng-probe-ext4" },
{ "lttng-probe-gpio" },
+ { "lttng-probe-i2c" },
{ "lttng-probe-irq" },
{ "lttng-probe-jbd" },
{ "lttng-probe-jbd2" },
{ "lttng-probe-irq" },
{ "lttng-probe-jbd" },
{ "lttng-probe-jbd2" },
@@
-180,9
+181,12
@@
static int modprobe_lttng(struct kern_modules_param *modules,
goto error;
}
goto error;
}
- ret = kmod_module_probe_insert_module(mod,
KMOD_PROBE_IGNORE_LOADED
,
+ ret = kmod_module_probe_insert_module(mod,
0
,
NULL, NULL, NULL, NULL);
NULL, NULL, NULL, NULL);
- if (ret < 0) {
+ if (ret == -EEXIST) {
+ DBG("Module %s is already loaded", modules[i].name);
+ ret = 0;
+ } else if (ret < 0) {
if (required) {
ERR("Unable to load required module %s",
modules[i].name);
if (required) {
ERR("Unable to load required module %s",
modules[i].name);
This page took
0.025167 seconds
and
4
git commands to generate.