Commit 3c253ca0 authored by Alon Bar-Lev's avatar Alon Bar-Lev Committed by Linus Torvalds

[PATCH] Dynamic kernel command-line: alpha

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: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 30d7e0d4
...@@ -122,7 +122,7 @@ static void get_sysnames(unsigned long, unsigned long, unsigned long, ...@@ -122,7 +122,7 @@ static void get_sysnames(unsigned long, unsigned long, unsigned long,
char **, char **); char **, char **);
static void determine_cpu_caches (unsigned int); static void determine_cpu_caches (unsigned int);
static char command_line[COMMAND_LINE_SIZE]; static char __initdata command_line[COMMAND_LINE_SIZE];
/* /*
* The format of "screen_info" is strange, and due to early * The format of "screen_info" is strange, and due to early
...@@ -547,7 +547,7 @@ setup_arch(char **cmdline_p) ...@@ -547,7 +547,7 @@ setup_arch(char **cmdline_p)
} else { } else {
strlcpy(command_line, COMMAND_LINE, sizeof command_line); strlcpy(command_line, COMMAND_LINE, sizeof command_line);
} }
strcpy(saved_command_line, command_line); strcpy(boot_command_line, command_line);
*cmdline_p = command_line; *cmdline_p = command_line;
/* /*
...@@ -589,7 +589,7 @@ setup_arch(char **cmdline_p) ...@@ -589,7 +589,7 @@ setup_arch(char **cmdline_p)
} }
/* Replace the command line, now that we've killed it with strsep. */ /* Replace the command line, now that we've killed it with strsep. */
strcpy(command_line, saved_command_line); strcpy(command_line, boot_command_line);
/* If we want SRM console printk echoing early, do it now. */ /* If we want SRM console printk echoing early, do it now. */
if (alpha_using_srm && srmcons_output) { if (alpha_using_srm && srmcons_output) {
......
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