diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-04 11:09:14 +1030 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-09 15:25:46 +1030 |
| commit | b504a33672da4de7c4d457532f2c758729ab62b0 (patch) | |
| tree | 2f6bb85bd20a1fac0e99dbf5e2cbbcb77975aa2c /init | |
| parent | 5c886584a758edba7e25ad9df974cf15a4a1f59d (diff) | |
param: combine core_param and early_param parsing.
David Howells points out that we can now do early_param and core_param
in a single pass of parse_args.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Cc: David Howells <dhowells@redhat.com>
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/init/main.c b/init/main.c index 145579d0c7b4..062cb1908b07 100644 --- a/init/main.c +++ b/init/main.c @@ -266,12 +266,6 @@ static bool __init is_core_param(const char *param) return false; } -/* We can ignore options not found in core params. */ -static int __init unknown_core_ok(char *param, char *val) -{ - return 0; -} - /* * Unknown boot options get handed to init, unless they look like * failed parameters @@ -548,12 +542,10 @@ void __init __weak thread_info_cache_init(void) asmlinkage void __init start_kernel(void) { arch_get_boot_command_line(); - parse_args("Core params", boot_command_line, __start___core_param, + parse_args("Core and early params", boot_command_line, + __start___core_param, __stop___core_param - __start___core_param, - unknown_core_ok, true); - /* All fall through to do_early_param. */ - parse_args("early options", boot_command_line, NULL, 0, do_early_param, - true); + do_early_param, true); smp_setup_processor_id(); |