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.

1 files changed, 5 insertions, 2 deletions

diff --git a/init/main.c b/init/main.c
index 5f191133376f..01573fdfa186 100644
--- a/init/main.c
+++ b/init/main.c
@@ -131,6 +131,8 @@ char __initdata boot_command_line[COMMAND_LINE_SIZE];
 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 inline void smp_prepare_cpus(unsigned int maxcpus) { }
 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 @@ static void __init do_initcall_level(int level)
         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);