diff options
Diffstat (limited to 'core/kmod')
| -rw-r--r-- | core/kmod/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch | 28 | ||||
| -rw-r--r-- | core/kmod/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch | 39 |
2 files changed, 0 insertions, 67 deletions
diff --git a/core/kmod/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch b/core/kmod/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch deleted file mode 100644 index 4ffc3e53b..000000000 --- a/core/kmod/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 269de2e0bf5011072da2f40f4f2d4023fad696b9 Mon Sep 17 00:00:00 2001 -From: Lucas De Marchi <lucas.demarchi@profusion.mobi> -Date: Tue, 7 Feb 2012 09:48:59 -0200 -Subject: [PATCH] libkmod-module: probe: Fix ignore-loaded flag not being - applied - ---- - TODO | 3 +++ - libkmod/libkmod-module.c | 3 ++- - 2 files changed, 5 insertions(+), 1 deletions(-) - -diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c -index 0af3e2e..b5eb7c9 100644 ---- a/libkmod/libkmod-module.c -+++ b/libkmod/libkmod-module.c -@@ -1132,7 +1132,8 @@ KMOD_EXPORT int kmod_module_probe_insert_module(struct kmod_module *mod, - if (mod == NULL) - return -ENOENT; - -- if (module_is_inkernel(mod)) { -+ if (!(flags & KMOD_PROBE_IGNORE_LOADED) -+ && module_is_inkernel(mod)) { - if (flags & KMOD_PROBE_FAIL_ON_LOADED) - return -EEXIST; - else --- -1.7.9 - diff --git a/core/kmod/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch b/core/kmod/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch deleted file mode 100644 index 95e7f859a..000000000 --- a/core/kmod/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 8cd0f9e4f9f5c093136a7a2c0c2998b9dd203161 Mon Sep 17 00:00:00 2001 -From: Lucas De Marchi <lucas.demarchi@profusion.mobi> -Date: Sat, 11 Feb 2012 19:45:29 -0200 -Subject: [PATCH] libkmod-module: probe: fix infinite loop with softdeps - -If a softdep depends on a module in the dependency list of the module -being inserted, we would enter and infinite loop. - -Move the "mod->visited = true" assignment to the proper place, hoping it -didn't break other use cases. This is a bug that comes and goes every -now and then. Since we have a testsuite now, a test for this should be -written. ---- - libkmod/libkmod-module.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c -index b5eb7c9..835896f 100644 ---- a/libkmod/libkmod-module.c -+++ b/libkmod/libkmod-module.c -@@ -1013,7 +1013,6 @@ static int __kmod_module_fill_softdep(struct kmod_module *mod, - goto fail; - } - *list = l; -- mod->visited = true; - mod->ignorecmd = (pre != NULL || post != NULL); - - kmod_list_foreach(l, post) { -@@ -1043,6 +1042,7 @@ static int __kmod_module_get_probe_list(struct kmod_module *mod, - mod->name); - return 0; - } -+ mod->visited = true; - - dep = kmod_module_get_dependencies(mod); - kmod_list_foreach(l, dep) { --- -1.7.9 - |