diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-12 04:09:52 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-12 04:09:52 -0300 |
| commit | 2c721caa534df76621bf07705ed0ea80efe44f8b (patch) | |
| tree | 7dac47c69e19cd2b978f154e9618e074b7410658 /testing | |
| parent | 020644b613452cc7ab48474b463e4a9d1088d8a3 (diff) | |
| parent | cfceb92e73d7f6a32494f0ba258b98748af43f34 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/aircrack-ng/PKGBUILD
community/geos/PKGBUILD
extra/v4l-utils/PKGBUILD
multilib/lib32-v4l-utils/PKGBUILD
staging/libxi/PKGBUILD
staging/mesa/PKGBUILD
staging/xorg-server/PKGBUILD
staging/xorg-server/autoconfig-nvidia.patch
testing/kmod/PKGBUILD
testing/libreoffice/PKGBUILD
testing/libreoffice/libreoffice.install
testing/systemd/PKGBUILD
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/kmod/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/testing/kmod/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch b/testing/kmod/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch new file mode 100644 index 000000000..4ffc3e53b --- /dev/null +++ b/testing/kmod/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch @@ -0,0 +1,28 @@ +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 + |