Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

Pull module updates from Rusty Russell: "Mainly boring here, too. rmmod --wait finally removed, though" * tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: modpost: fix bogus 'exported twice' warnings. init: fix in-place parameter modification regression asmlinkage, module: Make ksymtab and kcrctab symbols and __this_module __visible kernel: add support for init_array constructors modpost: Optionally ignore secondary errors seen if a single module build fails module: remove rmmod --wait option.

Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
Pull module updates from Rusty Russell: "Mainly boring here, too. rmmod --wait finally removed, though" * tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: modpost: fix bogus 'exported twice' warnings. init: fix in-place parameter modification regression asmlinkage, module: Make ksymtab and kcrctab symbols and __this_module __visible kernel: add support for init_array constructors modpost: Optionally ignore secondary errors seen if a single module build fails module: remove rmmod --wait option.
Linus Torvalds
2 parents d8fe4acc88 b6568b1a19
Showing 7 changed files Side-by-side Diff
include/asm-generic/vmlinux.lds.h
include/linux/export.h
include/linux/module.h
init/main.c
kernel/module.c
scripts/Makefile.modpost
scripts/mod/modpost.c
@@ -473,6 +473,7 @@
 #define KERNEL_CTORS()	. = ALIGN(8);			   \
 			VMLINUX_SYMBOL(__ctors_start) = .; \
 			*(.ctors)			   \
+			*(.init_array)			   \
 			VMLINUX_SYMBOL(__ctors_end) = .;
 #else
 #define KERNEL_CTORS()
@@ -43,7 +43,7 @@
 /* Mark the CRC weak since genksyms apparently decides not to
  * generate a checksums for some symbols */
 #define __CRC_SYMBOL(sym, sec)					\
-	extern void *__crc_##sym __attribute__((weak));		\
+	extern __visible void *__crc_##sym __attribute__((weak));		\
 	static const unsigned long __kcrctab_##sym		\
 	__used							\
 	__attribute__((section("___kcrctab" sec "+" #sym), unused))	\
@@ -59,7 +59,7 @@
 	static const char __kstrtab_##sym[]			\
 	__attribute__((section("__ksymtab_strings"), aligned(1))) \
 	= VMLINUX_SYMBOL_STR(sym);				\
-	static const struct kernel_symbol __ksymtab_##sym	\
+	__visible const struct kernel_symbol __ksymtab_##sym	\
 	__used							\
 	__attribute__((section("___ksymtab" sec "+" #sym), unused))	\
 	= { (unsigned long)&sym, __kstrtab_##sym }
@@ -367,9 +367,6 @@
 	/* What modules do I depend on? */
 	struct list_head target_list;
  
-	/* Who is waiting for us to be unloaded */
-	struct task_struct *waiter;
-
 	/* Destruction function. */
 	void (*exit)(void);
  
@@ -131,6 +131,8 @@
 char *saved_command_line;
 /* Command line for parameter parsing */
 static char *static_command_line;
+/* Command line for per-initcall parameter parsing */
+static char *initcall_command_line;
  
 static char *execute_command;
 static char *ramdisk_execute_command;
@@ -354,6 +356,7 @@
 static void __init setup_command_line(char *command_line)
 {
 	saved_command_line = alloc_bootmem(strlen (boot_command_line)+1);
+	initcall_command_line = alloc_bootmem(strlen (boot_command_line)+1);
 	static_command_line = alloc_bootmem(strlen (command_line)+1);
 	strcpy (saved_command_line, boot_command_line);
 	strcpy (static_command_line, command_line);
  
@@ -751,9 +754,9 @@
 	extern const struct kernel_param __start___param[], __stop___param[];
 	initcall_t *fn;
  
-	strcpy(static_command_line, saved_command_line);
+	strcpy(initcall_command_line, saved_command_line);
 	parse_args(initcall_level_names[level],
-		   static_command_line, __start___param,
+		   initcall_command_line, __start___param,
 		   __stop___param - __start___param,
 		   level, level,
 		   &repair_env_string);
@@ -641,8 +641,6 @@
  
 	/* Hold reference count during initialization. */
 	__this_cpu_write(mod->refptr->incs, 1);
-	/* Backwards compatibility macros put refcount during init. */
-	mod->waiter = current;
  
 	return 0;
 }
  
@@ -768,16 +766,9 @@
  
 static int try_stop_module(struct module *mod, int flags, int *forced)
 {
-	if (flags & O_NONBLOCK) {
-		struct stopref sref = { mod, flags, forced };
+	struct stopref sref = { mod, flags, forced };
  
-		return stop_machine(__try_stop_module, &sref, NULL);
-	} else {
-		/* We don't need to stop the machine for this. */
-		mod->state = MODULE_STATE_GOING;
-		synchronize_sched();
-		return 0;
-	}
+	return stop_machine(__try_stop_module, &sref, NULL);
 }
  
 unsigned long module_refcount(struct module *mod)
@@ -810,21 +801,6 @@
 /* This exists whether we can unload or not */
 static void free_module(struct module *mod);
  
-static void wait_for_zero_refcount(struct module *mod)
-{
-	/* Since we might sleep for some time, release the mutex first */
-	mutex_unlock(&module_mutex);
-	for (;;) {
-		pr_debug("Looking at refcount...\n");
-		set_current_state(TASK_UNINTERRUPTIBLE);
-		if (module_refcount(mod) == 0)
-			break;
-		schedule();
-	}
-	current->state = TASK_RUNNING;
-	mutex_lock(&module_mutex);
-}
-
 SYSCALL_DEFINE2(delete_module, const char __user *, name_user,
 		unsigned int, flags)
 {
@@ -839,6 +815,11 @@
 		return -EFAULT;
 	name[MODULE_NAME_LEN-1] = '\0';
  
+	if (!(flags & O_NONBLOCK)) {
+		printk(KERN_WARNING
+		       "waiting module removal not supported: please upgrade");
+	}
+
 	if (mutex_lock_interruptible(&module_mutex) != 0)
 		return -EINTR;
  
@@ -856,8 +837,7 @@
  
 	/* Doing init or already dying? */
 	if (mod->state != MODULE_STATE_LIVE) {
-		/* FIXME: if (force), slam module count and wake up
-                   waiter --RR */
+		/* FIXME: if (force), slam module count damn the torpedoes */
 		pr_debug("%s already dying\n", mod->name);
 		ret = -EBUSY;
 		goto out;
  
@@ -873,18 +853,11 @@
 		}
 	}
  
-	/* Set this up before setting mod->state */
-	mod->waiter = current;
-
 	/* Stop the machine so refcounts can't move and disable module. */
 	ret = try_stop_module(mod, flags, &forced);
 	if (ret != 0)
 		goto out;
  
-	/* Never wait if forced. */
-	if (!forced && module_refcount(mod) != 0)
-		wait_for_zero_refcount(mod);
-
 	mutex_unlock(&module_mutex);
 	/* Final destruction now no one is using it. */
 	if (mod->exit != NULL)
@@ -1002,9 +975,6 @@
 		__this_cpu_inc(module->refptr->decs);
  
 		trace_module_put(module, _RET_IP_);
-		/* Maybe they're waiting for us to drop reference? */
-		if (unlikely(!module_is_live(module)))
-			wake_up_process(module->waiter);
 		preempt_enable();
 	}
 }
@@ -2728,7 +2698,7 @@
 	return 0;
 }
  
-static void find_module_sections(struct module *mod, struct load_info *info)
+static int find_module_sections(struct module *mod, struct load_info *info)
 {
 	mod->kp = section_objs(info, "__param",
 			       sizeof(*mod->kp), &mod->num_kp);
@@ -2758,6 +2728,18 @@
 #ifdef CONFIG_CONSTRUCTORS
 	mod->ctors = section_objs(info, ".ctors",
 				  sizeof(*mod->ctors), &mod->num_ctors);
+	if (!mod->ctors)
+		mod->ctors = section_objs(info, ".init_array",
+				sizeof(*mod->ctors), &mod->num_ctors);
+	else if (find_sec(info, ".init_array")) {
+		/*
+		 * This shouldn't happen with same compiler and binutils
+		 * building all parts of the module.
+		 */
+		printk(KERN_WARNING "%s: has both .ctors and .init_array.\n",
+		       mod->name);
+		return -EINVAL;
+	}
 #endif
  
 #ifdef CONFIG_TRACEPOINTS
@@ -2795,6 +2777,8 @@
  
 	info->debug = section_objs(info, "__verbose",
 				   sizeof(*info->debug), &info->num_debug);
+
+	return 0;
 }
  
 static int move_module(struct module *mod, struct load_info *info)
@@ -3248,7 +3232,9 @@
  
 	/* Now we've got everything in the final locations, we can
 	 * find optional sections. */
-	find_module_sections(mod, info);
+	err = find_module_sections(mod, info);
+	if (err)
+		goto free_unload;
  
 	err = check_module_license_and_versions(mod);
 	if (err)
@@ -79,9 +79,11 @@
  $(if $(CONFIG_DEBUG_SECTION_MISMATCH),,-S)      \
  $(if $(KBUILD_EXTMOD)$(KBUILD_MODPOST_WARN),-w)
  
+MODPOST_OPT=$(subst -i,-n,$(filter -i,$(MAKEFLAGS)))
+
 # We can go over command line length here, so be careful.
 quiet_cmd_modpost = MODPOST $(words $(filter-out vmlinux FORCE, $^)) modules
-      cmd_modpost = $(MODLISTCMD) | sed 's/\.ko$$/.o/' | $(modpost) -s -T -
+      cmd_modpost = $(MODLISTCMD) | sed 's/\.ko$$/.o/' | $(modpost) $(MODPOST_OPT) -s -T -
  
 PHONY += __modpost
 __modpost: $(modules:.ko=.o) FORCE
@@ -17,6 +17,7 @@
 #include <string.h>
 #include <limits.h>
 #include <stdbool.h>
+#include <errno.h>
 #include "modpost.h"
 #include "../../include/generated/autoconf.h"
 #include "../../include/linux/license.h"
@@ -37,6 +38,8 @@
 /* How a symbol is exported */
 static int sec_mismatch_count = 0;
 static int sec_mismatch_verbose = 1;
+/* ignore missing files */
+static int ignore_missing_files;
  
 enum export {
 	export_plain,      export_unused,     export_gpl,
@@ -161,7 +164,7 @@
 	unsigned int vmlinux:1;    /* 1 if symbol is defined in vmlinux */
 	unsigned int kernel:1;     /* 1 if symbol is from kernel
 				    *  (only for external modules) **/
-	unsigned int preloaded:1;  /* 1 if symbol from Module.symvers */
+	unsigned int preloaded:1;  /* 1 if symbol from Module.symvers, or crc */
 	enum export  export;       /* Type of export */
 	char name[0];
 };
  
@@ -329,8 +332,11 @@
 {
 	struct symbol *s = find_symbol(name);
  
-	if (!s)
+	if (!s) {
 		s = new_symbol(name, mod, export);
+		/* Don't complain when we find it later. */
+		s->preloaded = 1;
+	}
 	s->crc = crc;
 	s->crc_valid = 1;
 }
@@ -407,6 +413,11 @@
  
 	hdr = grab_file(filename, &info->size);
 	if (!hdr) {
+		if (ignore_missing_files) {
+			fprintf(stderr, "%s: %s (ignored)\n", filename,
+				strerror(errno));
+			return 0;
+		}
 		perror(filename);
 		exit(1);
 	}
@@ -1852,7 +1863,7 @@
 	buf_printf(b, "\n");
 	buf_printf(b, "MODULE_INFO(vermagic, VERMAGIC_STRING);\n");
 	buf_printf(b, "\n");
-	buf_printf(b, "struct module __this_module\n");
+	buf_printf(b, "__visible struct module __this_module\n");
 	buf_printf(b, "__attribute__((section(\".gnu.linkonce.this_module\"))) = {\n");
 	buf_printf(b, "\t.name = KBUILD_MODNAME,\n");
 	if (mod->has_init)
@@ -2118,7 +2129,7 @@
 	struct ext_sym_list *extsym_iter;
 	struct ext_sym_list *extsym_start = NULL;
  
-	while ((opt = getopt(argc, argv, "i:I:e:msST:o:awM:K:")) != -1) {
+	while ((opt = getopt(argc, argv, "i:I:e:mnsST:o:awM:K:")) != -1) {
 		switch (opt) {
 		case 'i':
 			kernel_read = optarg;
@@ -2137,6 +2148,9 @@
 			break;
 		case 'm':
 			modversions = 1;
+			break;
+		case 'n':
+			ignore_missing_files = 1;
 			break;
 		case 'o':
 			dump_write = optarg;
...	...	@@ -473,6 +473,7 @@
473	473	#define KERNEL_CTORS() . = ALIGN(8); \
474	474	VMLINUX_SYMBOL(__ctors_start) = .; \
475	475	*(.ctors) \
	476	+ *(.init_array) \
476	477	VMLINUX_SYMBOL(__ctors_end) = .;
477	478	#else
478	479	#define KERNEL_CTORS()
...	...	@@ -43,7 +43,7 @@
43	43	/* Mark the CRC weak since genksyms apparently decides not to
44	44	* generate a checksums for some symbols */
45	45	#define __CRC_SYMBOL(sym, sec) \
46		- extern void *__crc_##sym __attribute__((weak)); \
	46	+ extern __visible void *__crc_##sym __attribute__((weak)); \
47	47	static const unsigned long __kcrctab_##sym \
48	48	__used \
49	49	__attribute__((section("___kcrctab" sec "+" #sym), unused)) \
...	...	@@ -59,7 +59,7 @@
59	59	static const char __kstrtab_##sym[] \
60	60	__attribute__((section("__ksymtab_strings"), aligned(1))) \
61	61	= VMLINUX_SYMBOL_STR(sym); \
62		- static const struct kernel_symbol __ksymtab_##sym \
	62	+ __visible const struct kernel_symbol __ksymtab_##sym \
63	63	__used \
64	64	__attribute__((section("___ksymtab" sec "+" #sym), unused)) \
65	65	= { (unsigned long)&sym, __kstrtab_##sym }
...	...	@@ -367,9 +367,6 @@
367	367	/* What modules do I depend on? */
368	368	struct list_head target_list;
369	369
370		- /* Who is waiting for us to be unloaded */
371		- struct task_struct *waiter;
372		-
373	370	/* Destruction function. */
374	371	void (*exit)(void);
375	372
...	...	@@ -131,6 +131,8 @@
131	131	char *saved_command_line;
132	132	/* Command line for parameter parsing */
133	133	static char *static_command_line;
	134	+/* Command line for per-initcall parameter parsing */
	135	+static char *initcall_command_line;
134	136
135	137	static char *execute_command;
136	138	static char *ramdisk_execute_command;
...	...	@@ -354,6 +356,7 @@
354	356	static void __init setup_command_line(char *command_line)
355	357	{
356	358	saved_command_line = alloc_bootmem(strlen (boot_command_line)+1);
	359	+ initcall_command_line = alloc_bootmem(strlen (boot_command_line)+1);
357	360	static_command_line = alloc_bootmem(strlen (command_line)+1);
358	361	strcpy (saved_command_line, boot_command_line);
359	362	strcpy (static_command_line, command_line);
360	363
...	...	@@ -751,9 +754,9 @@
751	754	extern const struct kernel_param __start___param[], __stop___param[];
752	755	initcall_t *fn;
753	756
754		- strcpy(static_command_line, saved_command_line);
	757	+ strcpy(initcall_command_line, saved_command_line);
755	758	parse_args(initcall_level_names[level],
756		- static_command_line, __start___param,
	759	+ initcall_command_line, __start___param,
757	760	__stop___param - __start___param,
758	761	level, level,
759	762	&repair_env_string);
...	...	@@ -641,8 +641,6 @@
641	641
642	642	/* Hold reference count during initialization. */
643	643	__this_cpu_write(mod->refptr->incs, 1);
644		- /* Backwards compatibility macros put refcount during init. */
645		- mod->waiter = current;
646	644
647	645	return 0;
648	646	}
649	647
...	...	@@ -768,16 +766,9 @@
768	766
769	767	static int try_stop_module(struct module mod, int flags, int forced)
770	768	{
771		- if (flags & O_NONBLOCK) {
772		- struct stopref sref = { mod, flags, forced };
	769	+ struct stopref sref = { mod, flags, forced };
773	770
774		- return stop_machine(__try_stop_module, &sref, NULL);
775		- } else {
776		- /* We don't need to stop the machine for this. */
777		- mod->state = MODULE_STATE_GOING;
778		- synchronize_sched();
779		- return 0;
780		- }
	771	+ return stop_machine(__try_stop_module, &sref, NULL);
781	772	}
782	773
783	774	unsigned long module_refcount(struct module *mod)
...	...	@@ -810,21 +801,6 @@
810	801	/* This exists whether we can unload or not */
811	802	static void free_module(struct module *mod);
812	803
813		-static void wait_for_zero_refcount(struct module *mod)
814		-{
815		- /* Since we might sleep for some time, release the mutex first */
816		- mutex_unlock(&module_mutex);
817		- for (;;) {
818		- pr_debug("Looking at refcount...\n");
819		- set_current_state(TASK_UNINTERRUPTIBLE);
820		- if (module_refcount(mod) == 0)
821		- break;
822		- schedule();
823		- }
824		- current->state = TASK_RUNNING;
825		- mutex_lock(&module_mutex);
826		-}
827		-
828	804	SYSCALL_DEFINE2(delete_module, const char __user *, name_user,
829	805	unsigned int, flags)
830	806	{
...	...	@@ -839,6 +815,11 @@
839	815	return -EFAULT;
840	816	name[MODULE_NAME_LEN-1] = '\0';
841	817
	818	+ if (!(flags & O_NONBLOCK)) {
	819	+ printk(KERN_WARNING
	820	+ "waiting module removal not supported: please upgrade");
	821	+ }
	822	+
842	823	if (mutex_lock_interruptible(&module_mutex) != 0)
843	824	return -EINTR;
844	825
...	...	@@ -856,8 +837,7 @@
856	837
857	838	/* Doing init or already dying? */
858	839	if (mod->state != MODULE_STATE_LIVE) {
859		- /* FIXME: if (force), slam module count and wake up
860		- waiter --RR */
	840	+ /* FIXME: if (force), slam module count damn the torpedoes */
861	841	pr_debug("%s already dying\n", mod->name);
862	842	ret = -EBUSY;
863	843	goto out;
864	844
...	...	@@ -873,18 +853,11 @@
873	853	}
874	854	}
875	855
876		- /* Set this up before setting mod->state */
877		- mod->waiter = current;
878		-
879	856	/* Stop the machine so refcounts can't move and disable module. */
880	857	ret = try_stop_module(mod, flags, &forced);
881	858	if (ret != 0)
882	859	goto out;
883	860
884		- /* Never wait if forced. */
885		- if (!forced && module_refcount(mod) != 0)
886		- wait_for_zero_refcount(mod);
887		-
888	861	mutex_unlock(&module_mutex);
889	862	/* Final destruction now no one is using it. */
890	863	if (mod->exit != NULL)
...	...	@@ -1002,9 +975,6 @@
1002	975	__this_cpu_inc(module->refptr->decs);
1003	976
1004	977	trace_module_put(module, _RET_IP_);
1005		- /* Maybe they're waiting for us to drop reference? */
1006		- if (unlikely(!module_is_live(module)))
1007		- wake_up_process(module->waiter);
1008	978	preempt_enable();
1009	979	}
1010	980	}
...	...	@@ -2728,7 +2698,7 @@
2728	2698	return 0;
2729	2699	}
2730	2700
2731		-static void find_module_sections(struct module mod, struct load_info info)
	2701	+static int find_module_sections(struct module mod, struct load_info info)
2732	2702	{
2733	2703	mod->kp = section_objs(info, "__param",
2734	2704	sizeof(*mod->kp), &mod->num_kp);
...	...	@@ -2758,6 +2728,18 @@
2758	2728	#ifdef CONFIG_CONSTRUCTORS
2759	2729	mod->ctors = section_objs(info, ".ctors",
2760	2730	sizeof(*mod->ctors), &mod->num_ctors);
	2731	+ if (!mod->ctors)
	2732	+ mod->ctors = section_objs(info, ".init_array",
	2733	+ sizeof(*mod->ctors), &mod->num_ctors);
	2734	+ else if (find_sec(info, ".init_array")) {
	2735	+ /*
	2736	+ * This shouldn't happen with same compiler and binutils
	2737	+ * building all parts of the module.
	2738	+ */
	2739	+ printk(KERN_WARNING "%s: has both .ctors and .init_array.\n",
	2740	+ mod->name);
	2741	+ return -EINVAL;
	2742	+ }
2761	2743	#endif
2762	2744
2763	2745	#ifdef CONFIG_TRACEPOINTS
...	...	@@ -2795,6 +2777,8 @@
2795	2777
2796	2778	info->debug = section_objs(info, "__verbose",
2797	2779	sizeof(*info->debug), &info->num_debug);
	2780	+
	2781	+ return 0;
2798	2782	}
2799	2783
2800	2784	static int move_module(struct module mod, struct load_info info)
...	...	@@ -3248,7 +3232,9 @@
3248	3232
3249	3233	/* Now we've got everything in the final locations, we can
3250	3234	* find optional sections. */
3251		- find_module_sections(mod, info);
	3235	+ err = find_module_sections(mod, info);
	3236	+ if (err)
	3237	+ goto free_unload;
3252	3238
3253	3239	err = check_module_license_and_versions(mod);
3254	3240	if (err)
...	...	@@ -79,9 +79,11 @@
79	79	$(if $(CONFIG_DEBUG_SECTION_MISMATCH),,-S) \
80	80	$(if $(KBUILD_EXTMOD)$(KBUILD_MODPOST_WARN),-w)
81	81
	82	+MODPOST_OPT=$(subst -i,-n,$(filter -i,$(MAKEFLAGS)))
	83	+
82	84	# We can go over command line length here, so be careful.
83	85	quiet_cmd_modpost = MODPOST $(words $(filter-out vmlinux FORCE, $^)) modules
84		- cmd_modpost = $(MODLISTCMD) \| sed 's/\.ko$$/.o/' \| $(modpost) -s -T -
	86	+ cmd_modpost = $(MODLISTCMD) \| sed 's/\.ko$$/.o/' \| $(modpost) $(MODPOST_OPT) -s -T -
85	87
86	88	PHONY += __modpost
87	89	__modpost: $(modules:.ko=.o) FORCE
...	...	@@ -17,6 +17,7 @@
17	17	#include <string.h>
18	18	#include <limits.h>
19	19	#include <stdbool.h>
	20	+#include <errno.h>
20	21	#include "modpost.h"
21	22	#include "../../include/generated/autoconf.h"
22	23	#include "../../include/linux/license.h"
...	...	@@ -37,6 +38,8 @@
37	38	/* How a symbol is exported */
38	39	static int sec_mismatch_count = 0;
39	40	static int sec_mismatch_verbose = 1;
	41	+/* ignore missing files */
	42	+static int ignore_missing_files;
40	43
41	44	enum export {
42	45	export_plain, export_unused, export_gpl,
...	...	@@ -161,7 +164,7 @@
161	164	unsigned int vmlinux:1; /* 1 if symbol is defined in vmlinux */
162	165	unsigned int kernel:1; /* 1 if symbol is from kernel
163	166	* (only for external modules) **/
164		- unsigned int preloaded:1; /* 1 if symbol from Module.symvers */
	167	+ unsigned int preloaded:1; /* 1 if symbol from Module.symvers, or crc */
165	168	enum export export; /* Type of export */
166	169	char name[0];
167	170	};
168	171
...	...	@@ -329,8 +332,11 @@
329	332	{
330	333	struct symbol *s = find_symbol(name);
331	334
332		- if (!s)
	335	+ if (!s) {
333	336	s = new_symbol(name, mod, export);
	337	+ /* Don't complain when we find it later. */
	338	+ s->preloaded = 1;
	339	+ }
334	340	s->crc = crc;
335	341	s->crc_valid = 1;
336	342	}
...	...	@@ -407,6 +413,11 @@
407	413
408	414	hdr = grab_file(filename, &info->size);
409	415	if (!hdr) {
	416	+ if (ignore_missing_files) {
	417	+ fprintf(stderr, "%s: %s (ignored)\n", filename,
	418	+ strerror(errno));
	419	+ return 0;
	420	+ }
410	421	perror(filename);
411	422	exit(1);
412	423	}
...	...	@@ -1852,7 +1863,7 @@
1852	1863	buf_printf(b, "\n");
1853	1864	buf_printf(b, "MODULE_INFO(vermagic, VERMAGIC_STRING);\n");
1854	1865	buf_printf(b, "\n");
1855		- buf_printf(b, "struct module __this_module\n");
	1866	+ buf_printf(b, "__visible struct module __this_module\n");
1856	1867	buf_printf(b, "__attribute__((section(\".gnu.linkonce.this_module\"))) = {\n");
1857	1868	buf_printf(b, "\t.name = KBUILD_MODNAME,\n");
1858	1869	if (mod->has_init)
...	...	@@ -2118,7 +2129,7 @@
2118	2129	struct ext_sym_list *extsym_iter;
2119	2130	struct ext_sym_list *extsym_start = NULL;
2120	2131
2121		- while ((opt = getopt(argc, argv, "i:I:e:msST:o:awM:K:")) != -1) {
	2132	+ while ((opt = getopt(argc, argv, "i:I:e:mnsST:o:awM:K:")) != -1) {
2122	2133	switch (opt) {
2123	2134	case 'i':
2124	2135	kernel_read = optarg;
...	...	@@ -2137,6 +2148,9 @@
2137	2148	break;
2138	2149	case 'm':
2139	2150	modversions = 1;
	2151	+ break;
	2152	+ case 'n':
	2153	+ ignore_missing_files = 1;
2140	2154	break;
2141	2155	case 'o':
2142	2156	dump_write = optarg;