Skip to content

Commit

Permalink
[PATCH] Dynamic kernel command-line: parisc
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alon Bar-Lev authored and Linus Torvalds committed Feb 12, 2007
1 parent 43cd346 commit 668f993
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions arch/parisc/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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? */
Expand All @@ -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;
}

Expand Down
4 changes: 2 additions & 2 deletions arch/parisc/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 668f993

Please sign in to comment.