Tom Rini <trini@kernel.crashing.org>
- Remove saved_command_line (and saving of the command line).
- Call parse_early_options
---
25-akpm/arch/alpha/kernel/setup.c | 4 ++--
25-akpm/arch/alpha/kernel/vmlinux.lds.S | 5 +++++
25-akpm/include/asm-alpha/setup.h | 6 ++++++
25-akpm/include/asm-alpha/system.h | 1 -
4 files changed, 13 insertions(+), 3 deletions(-)
diff -puN arch/alpha/kernel/setup.c~early-param-alpha arch/alpha/kernel/setup.c
--- 25/arch/alpha/kernel/setup.c~early-param-alpha 2004-03-30 19:49:06.619932200 -0800
+++ 25-akpm/arch/alpha/kernel/setup.c 2004-03-30 19:49:06.624931440 -0800
@@ -56,6 +56,7 @@ static struct notifier_block alpha_panic
#include <asm/io.h>
#include <asm/mmu_context.h>
#include <asm/console.h>
+#include <asm/setup.h>
#include "proto.h"
#include "pci_impl.h"
@@ -115,7 +116,6 @@ static void get_sysnames(unsigned long,
char **, char **);
static char command_line[COMMAND_LINE_SIZE];
-char saved_command_line[COMMAND_LINE_SIZE];
/*
* The format of "screen_info" is strange, and due to early
@@ -527,8 +527,8 @@ setup_arch(char **cmdline_p)
} else {
strlcpy(command_line, COMMAND_LINE, sizeof command_line);
}
- strcpy(saved_command_line, command_line);
*cmdline_p = command_line;
+ parse_early_options(cmdline_p);
/*
* Process command-line arguments.
diff -puN arch/alpha/kernel/vmlinux.lds.S~early-param-alpha arch/alpha/kernel/vmlinux.lds.S
--- 25/arch/alpha/kernel/vmlinux.lds.S~early-param-alpha 2004-03-30 19:49:06.620932048 -0800
+++ 25-akpm/arch/alpha/kernel/vmlinux.lds.S 2004-03-30 19:49:06.624931440 -0800
@@ -45,6 +45,11 @@ SECTIONS
__setup_end = .;
. = ALIGN(8);
+ __early_begin = .;
+ __early_param : { *(__early_param) }
+ __early_end = .;
+
+ . = ALIGN(8);
__start___param = .;
__param : { *(__param) }
__stop___param = .;
diff -puN /dev/null include/asm-alpha/setup.h
--- /dev/null 2003-09-15 06:40:47.000000000 -0700
+++ 25-akpm/include/asm-alpha/setup.h 2004-03-30 19:49:06.625931288 -0800
@@ -0,0 +1,6 @@
+#ifndef __ALPHA_SETUP_H
+#define __ALPHA_SETUP_H
+
+#define COMMAND_LINE_SIZE 256
+
+#endif
diff -puN include/asm-alpha/system.h~early-param-alpha include/asm-alpha/system.h
--- 25/include/asm-alpha/system.h~early-param-alpha 2004-03-30 19:49:06.622931744 -0800
+++ 25-akpm/include/asm-alpha/system.h 2004-03-30 19:49:06.625931288 -0800
@@ -43,7 +43,6 @@
*/
#define PARAM ZERO_PGE
#define COMMAND_LINE ((char*)(PARAM + 0x0000))
-#define COMMAND_LINE_SIZE 256
#define INITRD_START (*(unsigned long *) (PARAM+0x100))
#define INITRD_SIZE (*(unsigned long *) (PARAM+0x108))
_