modpost: add option to allow external modules to avoid taint

Make integrated compat-wireless take advantage of the above
Turn-on backports again, since TAINT_OOT_MODULE issue is resolved
Update compat-wireless snapshot from 2011-12-18

1 files changed, 80 insertions, 0 deletions

diff --git a/modpost-add-option-to-allow-external-modules-to-avoi.patch b/modpost-add-option-to-allow-external-modules-to-avoi.patch
new file mode 100644
index 000000000..d20385457
--- /dev/null
+++ b/modpost-add-option-to-allow-external-modules-to-avoi.patch
@@ -0,0 +1,80 @@
+From 69f63a67165da5e9f08c1132521598701d914573 Mon Sep 17 00:00:00 2001
+From: John W. Linville <linville@tuxdriver.com>
+Date: Wed, 14 Dec 2011 11:09:04 -0500
+Subject: [PATCH] modpost: add option to allow external modules to avoid taint
+
+In some cases, it might be desirable to package a module from an
+external source tree alongside the base kernel.  In those cases, it
+might also be desirable to not have those modules tainting the kernel.
+
+This patch provides a mechanism for an external module build to declare
+itself as an "integrated build".  Such a module is then treated the same
+as an intree module.
+
+Signed-off-by: John W. Linville <linville@tuxdriver.com>
+---
+Any thoughts on this?  I'm thinking of adding this to Fedora kernels,
+where I have been working to integrate the compat-wireless package as
+part of the base kernel RPM.
+
+ scripts/Makefile.modpost |    1 +
+ scripts/mod/modpost.c    |   10 ++++++++--
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
+index 08dce14..160c6fb 100644
+--- a/scripts/Makefile.modpost
++++ b/scripts/Makefile.modpost
+@@ -81,6 +81,7 @@ modpost = scripts/mod/modpost                    \
+  $(if $(KBUILD_EXTMOD),-o $(modulesymfile))      \
+  $(if $(CONFIG_DEBUG_SECTION_MISMATCH),,-S)      \
+  $(if $(KBUILD_EXTMOD)$(KBUILD_MODPOST_WARN),-w) \
++ $(if $(INTEGRATED_BUILD),-B) \
+  $(if $(cross_build),-c)
+ 
+ quiet_cmd_modpost = MODPOST $(words $(filter-out vmlinux FORCE, $^)) modules
+diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
+index 2bd594e..5d077f9 100644
+--- a/scripts/mod/modpost.c
++++ b/scripts/mod/modpost.c
+@@ -43,6 +43,9 @@ static int warn_unresolved = 0;
+ static int sec_mismatch_count = 0;
+ static int sec_mismatch_verbose = 1;
+ 
++/* Is this a module being built as part of an integrated package? */
++static int integrated_build = 0;
++
+ enum export {
+ 	export_plain,      export_unused,     export_gpl,
+ 	export_unused_gpl, export_gpl_future, export_unknown
+@@ -1851,7 +1854,7 @@ static void add_header(struct buffer *b, struct module *mod)
+ 
+ static void add_intree_flag(struct buffer *b, int is_intree)
+ {
+-	if (is_intree)
++	if (is_intree || integrated_build)
+ 		buf_printf(b, "\nMODULE_INFO(intree, \"Y\");\n");
+ }
+ 
+@@ -2101,7 +2104,7 @@ int main(int argc, char **argv)
+ 	struct ext_sym_list *extsym_iter;
+ 	struct ext_sym_list *extsym_start = NULL;
+ 
+-	while ((opt = getopt(argc, argv, "i:I:e:cmsSo:awM:K:")) != -1) {
++	while ((opt = getopt(argc, argv, "i:I:e:cmsSo:awM:K:B")) != -1) {
+ 		switch (opt) {
+ 		case 'i':
+ 			kernel_read = optarg;
+@@ -2139,6 +2142,9 @@ int main(int argc, char **argv)
+ 		case 'w':
+ 			warn_unresolved = 1;
+ 			break;
++		case 'B':
++			integrated_build = 1;
++			break;
+ 		default:
+ 			exit(1);
+ 		}
+-- 
+1.7.4.4
+