- Remove saved_command_line (and saving of the command line).
- Call parse_early_options
---
linux-2.6-early_setup-trini/arch/um/kernel/um_arch.c | 1 +
linux-2.6-early_setup-trini/arch/um/kernel/user_util.c | 1 -
linux-2.6-early_setup-trini/include/asm-um/common.lds.S | 4 ++++
3 files changed, 5 insertions(+), 1 deletion(-)
diff -puN arch/um/kernel/um_arch.c~um arch/um/kernel/um_arch.c
--- linux-2.6-early_setup/arch/um/kernel/um_arch.c~um 2004-03-24 16:15:10.165898466 -0700
+++ linux-2.6-early_setup-trini/arch/um/kernel/um_arch.c 2004-03-24 16:15:10.171897115 -0700
@@ -395,6 +395,7 @@ void __init setup_arch(char **cmdline_p)
paging_init();
strcpy(command_line, saved_command_line);
*cmdline_p = command_line;
+ parse_early_options(cmdline_p);
setup_hostinfo();
}
diff -puN arch/um/kernel/user_util.c~um arch/um/kernel/user_util.c
--- linux-2.6-early_setup/arch/um/kernel/user_util.c~um 2004-03-24 16:15:10.167898016 -0700
+++ linux-2.6-early_setup-trini/arch/um/kernel/user_util.c 2004-03-24 16:15:10.172896890 -0700
@@ -34,7 +34,6 @@
#define COMMAND_LINE_SIZE _POSIX_ARG_MAX
/* Changed in linux_main and setup_arch, which run before SMP is started */
-char saved_command_line[COMMAND_LINE_SIZE] = { 0 };
char command_line[COMMAND_LINE_SIZE] = { 0 };
void add_arg(char *cmd_line, char *arg)
diff -puN include/asm-um/common.lds.S~um include/asm-um/common.lds.S
--- linux-2.6-early_setup/include/asm-um/common.lds.S~um 2004-03-24 16:15:10.169897565 -0700
+++ linux-2.6-early_setup-trini/include/asm-um/common.lds.S 2004-03-24 16:15:10.172896890 -0700
@@ -46,6 +46,10 @@
.init.setup : { *(.init.setup) }
__setup_end = .;
+ __early_begin = .;
+ __early_param : { *(__early_param) }
+ __early_end = .;
+
__start___param = .;
__param : { *(__param) }
__stop___param = .;
_