Commit 668f9931 authored by Alon Bar-Lev's avatar Alon Bar-Lev Committed by Linus Torvalds

[PATCH] Dynamic kernel command-line: parisc

1. Rename saved_command_line into boot_command_line.
2. Set command_line as __initdata.
Signed-off-by: default avatarAlon Bar-Lev <alon.barlev@gmail.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 43cd3464
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/setup.h> #include <asm/setup.h>
char command_line[COMMAND_LINE_SIZE] __read_mostly; char __initdata command_line[COMMAND_LINE_SIZE] __read_mostly;
/* Intended for ccio/sba/cpu statistics under /proc/bus/{runway|gsc} */ /* Intended for ccio/sba/cpu statistics under /proc/bus/{runway|gsc} */
struct proc_dir_entry * proc_runway_root __read_mostly = NULL; struct proc_dir_entry * proc_runway_root __read_mostly = NULL;
...@@ -71,9 +71,9 @@ void __init setup_cmdline(char **cmdline_p) ...@@ -71,9 +71,9 @@ void __init setup_cmdline(char **cmdline_p)
/* boot_args[0] is free-mem start, boot_args[1] is ptr to command line */ /* boot_args[0] is free-mem start, boot_args[1] is ptr to command line */
if (boot_args[0] < 64) { if (boot_args[0] < 64) {
/* called from hpux boot loader */ /* called from hpux boot loader */
saved_command_line[0] = '\0'; boot_command_line[0] = '\0';
} else { } else {
strcpy(saved_command_line, (char *)__va(boot_args[1])); strcpy(boot_command_line, (char *)__va(boot_args[1]));
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
if (boot_args[2] != 0) /* did palo pass us a ramdisk? */ if (boot_args[2] != 0) /* did palo pass us a ramdisk? */
...@@ -84,7 +84,7 @@ void __init setup_cmdline(char **cmdline_p) ...@@ -84,7 +84,7 @@ void __init setup_cmdline(char **cmdline_p)
#endif #endif
} }
strcpy(command_line, saved_command_line); strcpy(command_line, boot_command_line);
*cmdline_p = command_line; *cmdline_p = command_line;
} }
......
...@@ -77,12 +77,12 @@ static void __init mem_limit_func(void) ...@@ -77,12 +77,12 @@ static void __init mem_limit_func(void)
{ {
char *cp, *end; char *cp, *end;
unsigned long limit; unsigned long limit;
extern char saved_command_line[]; extern char __initdata boot_command_line[];
/* We need this before __setup() functions are called */ /* We need this before __setup() functions are called */
limit = MAX_MEM; limit = MAX_MEM;
for (cp = saved_command_line; *cp; ) { for (cp = boot_command_line; *cp; ) {
if (memcmp(cp, "mem=", 4) == 0) { if (memcmp(cp, "mem=", 4) == 0) {
cp += 4; cp += 4;
limit = memparse(cp, &end); limit = memparse(cp, &end);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment