2004-03-25 00:07:52

by Tom Rini

[permalink] [raw]
Subject: [patch 8/22] __early_param for h8300


- Remove saved_command_line (and saving of the command line).
- Call parse_early_options


---

linux-2.6-early_setup-trini/arch/h8300/kernel/setup.c | 4 +---
linux-2.6-early_setup-trini/arch/h8300/kernel/vmlinux.lds.S | 5 +++++
2 files changed, 6 insertions(+), 3 deletions(-)

diff -puN arch/h8300/kernel/setup.c~h8300 arch/h8300/kernel/setup.c
--- linux-2.6-early_setup/arch/h8300/kernel/setup.c~h8300 2004-03-24 16:15:06.866641509 -0700
+++ linux-2.6-early_setup-trini/arch/h8300/kernel/setup.c 2004-03-24 16:15:06.870640609 -0700
@@ -61,7 +61,6 @@ unsigned long memory_end;
struct task_struct *_current_task;

char command_line[512];
-char saved_command_line[512];

extern int _stext, _etext, _sdata, _edata, _sbss, _ebss, _end;
extern int _ramstart, _ramend;
@@ -166,8 +165,7 @@ void __init setup_arch(char **cmdline_p)
#endif
/* Keep a copy of command line */
*cmdline_p = &command_line[0];
- memcpy(saved_command_line, command_line, sizeof(saved_command_line));
- saved_command_line[sizeof(saved_command_line)-1] = 0;
+ parse_early_options(cmdline_p);

#ifdef DEBUG
if (strlen(*cmdline_p))
diff -puN arch/h8300/kernel/vmlinux.lds.S~h8300 arch/h8300/kernel/vmlinux.lds.S
--- linux-2.6-early_setup/arch/h8300/kernel/vmlinux.lds.S~h8300 2004-03-24 16:15:06.868641059 -0700
+++ linux-2.6-early_setup-trini/arch/h8300/kernel/vmlinux.lds.S 2004-03-24 16:15:06.870640609 -0700
@@ -131,6 +131,11 @@ SECTIONS
*(.init.setup)
. = ALIGN(0x4) ;
___setup_end = .;
+
+ __early_begin = .;
+ *(__early_param)
+ __early_end = .;
+
___start___param = .;
*(__param)
___stop___param = .;

_