mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
[PATCH] Dynamic kernel command-line: parisc
1. Rename saved_command_line into boot_command_line. 2. Set command_line as __initdata. Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com> Cc: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
43cd34645d
commit
668f9931c8
2 changed files with 6 additions and 6 deletions
|
@ -45,7 +45,7 @@
|
|||
#include <asm/io.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} */
|
||||
struct proc_dir_entry * proc_runway_root __read_mostly = NULL;
|
||||
|
@ -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 */
|
||||
if (boot_args[0] < 64) {
|
||||
/* called from hpux boot loader */
|
||||
saved_command_line[0] = '\0';
|
||||
boot_command_line[0] = '\0';
|
||||
} else {
|
||||
strcpy(saved_command_line, (char *)__va(boot_args[1]));
|
||||
strcpy(boot_command_line, (char *)__va(boot_args[1]));
|
||||
|
||||
#ifdef CONFIG_BLK_DEV_INITRD
|
||||
if (boot_args[2] != 0) /* did palo pass us a ramdisk? */
|
||||
|
@ -84,7 +84,7 @@ void __init setup_cmdline(char **cmdline_p)
|
|||
#endif
|
||||
}
|
||||
|
||||
strcpy(command_line, saved_command_line);
|
||||
strcpy(command_line, boot_command_line);
|
||||
*cmdline_p = command_line;
|
||||
}
|
||||
|
||||
|
|
|
@ -77,12 +77,12 @@ static void __init mem_limit_func(void)
|
|||
{
|
||||
char *cp, *end;
|
||||
unsigned long limit;
|
||||
extern char saved_command_line[];
|
||||
extern char __initdata boot_command_line[];
|
||||
|
||||
/* We need this before __setup() functions are called */
|
||||
|
||||
limit = MAX_MEM;
|
||||
for (cp = saved_command_line; *cp; ) {
|
||||
for (cp = boot_command_line; *cp; ) {
|
||||
if (memcmp(cp, "mem=", 4) == 0) {
|
||||
cp += 4;
|
||||
limit = memparse(cp, &end);
|
||||
|
|
Loading…
Reference in a new issue