summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2012-06-08 14:58:13 +0930
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-17 11:21:23 -0700
commit3410afedcda2f504e8fbe02a7f4c49912ce688c8 (patch)
tree8a08670ff706045ab51f6a863e04469a2421c8b3 /init
parente6e70e4c7ef345d3af2d2ba98c2d2f175aa64c2a (diff)
downloadlwn-3410afedcda2f504e8fbe02a7f4c49912ce688c8.tar.gz
lwn-3410afedcda2f504e8fbe02a7f4c49912ce688c8.zip
module_param: stop double-calling parameters.
commit ae82fdb1406ad41d68f07027fe31f2d35ba22a90 upstream. Commit 026cee0086fe1df4cf74691cf273062cc769617d "params: <level>_initcall-like kernel parameters" set old-style module parameters to level 0. And we call those level 0 calls where we used to, early in start_kernel(). We also loop through the initcall levels and call the levelled module_params before the corresponding initcall. Unfortunately level 0 is early_init(), so we call the standard module_param calls twice. (Turns out most things don't care, but at least ubi.mtd does). Change the level to -1 for standard module_param calls. Reported-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'init')
-rw-r--r--init/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c
index cb54cd3dbf05..b08c5f75974f 100644
--- a/init/main.c
+++ b/init/main.c
@@ -508,7 +508,7 @@ asmlinkage void __init start_kernel(void)
parse_early_param();
parse_args("Booting kernel", static_command_line, __start___param,
__stop___param - __start___param,
- 0, 0, &unknown_bootoption);
+ -1, -1, &unknown_bootoption);
jump_label_init();