diff options
author | Alon Bar-Lev <alon.barlev@gmail.com> | 2007-02-12 03:54:05 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-12 12:48:37 -0500 |
commit | 3c253ca0f0930b767a5d6ac0c1b3c6f5619e28f9 (patch) | |
tree | e9044d7a806172c864bbc1df268e0deb1a86b9f5 | |
parent | 30d7e0d466b3ac0b5ef77e4062bf9385f0d72270 (diff) |
[PATCH] Dynamic kernel command-line: alpha
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: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/alpha/kernel/setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c index 1aea7c7c683c..d352c2b05f1a 100644 --- a/arch/alpha/kernel/setup.c +++ b/arch/alpha/kernel/setup.c | |||
@@ -122,7 +122,7 @@ static void get_sysnames(unsigned long, unsigned long, unsigned long, | |||
122 | char **, char **); | 122 | char **, char **); |
123 | static void determine_cpu_caches (unsigned int); | 123 | static void determine_cpu_caches (unsigned int); |
124 | 124 | ||
125 | static char command_line[COMMAND_LINE_SIZE]; | 125 | static char __initdata command_line[COMMAND_LINE_SIZE]; |
126 | 126 | ||
127 | /* | 127 | /* |
128 | * The format of "screen_info" is strange, and due to early | 128 | * The format of "screen_info" is strange, and due to early |
@@ -547,7 +547,7 @@ setup_arch(char **cmdline_p) | |||
547 | } else { | 547 | } else { |
548 | strlcpy(command_line, COMMAND_LINE, sizeof command_line); | 548 | strlcpy(command_line, COMMAND_LINE, sizeof command_line); |
549 | } | 549 | } |
550 | strcpy(saved_command_line, command_line); | 550 | strcpy(boot_command_line, command_line); |
551 | *cmdline_p = command_line; | 551 | *cmdline_p = command_line; |
552 | 552 | ||
553 | /* | 553 | /* |
@@ -589,7 +589,7 @@ setup_arch(char **cmdline_p) | |||
589 | } | 589 | } |
590 | 590 | ||
591 | /* Replace the command line, now that we've killed it with strsep. */ | 591 | /* Replace the command line, now that we've killed it with strsep. */ |
592 | strcpy(command_line, saved_command_line); | 592 | strcpy(command_line, boot_command_line); |
593 | 593 | ||
594 | /* If we want SRM console printk echoing early, do it now. */ | 594 | /* If we want SRM console printk echoing early, do it now. */ |
595 | if (alpha_using_srm && srmcons_output) { | 595 | if (alpha_using_srm && srmcons_output) { |