Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] Dynamic kernel command-line: ia64

1. Rename saved_command_line into boot_command_line.
2. Set command_line as __initdata.

[akpm@osdl.org: move some declarations to the right place]
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
Cc: "Luck, Tony" <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Alon Bar-Lev and committed by
Linus Torvalds
a8d91b84 4e498b66

+8 -6
+3 -2
arch/ia64/kernel/efi.c
··· 405 405 ia64_srlz_i(); 406 406 } 407 407 408 + extern char __initdata boot_command_line[]; 409 + 408 410 void __init 409 411 efi_init (void) 410 412 { ··· 415 413 efi_char16_t *c16; 416 414 u64 efi_desc_size; 417 415 char *cp, vendor[100] = "unknown"; 418 - extern char saved_command_line[]; 419 416 int i; 420 417 421 418 /* it's too early to be able to use the standard kernel command line support... */ 422 - for (cp = saved_command_line; *cp; ) { 419 + for (cp = boot_command_line; *cp; ) { 423 420 if (memcmp(cp, "mem=", 4) == 0) { 424 421 mem_limit = memparse(cp + 4, &cp); 425 422 } else if (memcmp(cp, "max_addr=", 9) == 0) {
+3 -2
arch/ia64/kernel/sal.c
··· 190 190 } 191 191 } 192 192 193 + extern char __initdata boot_command_line[]; 194 + 193 195 static void __init 194 196 chk_nointroute_opt(void) 195 197 { 196 198 char *cp; 197 - extern char saved_command_line[]; 198 199 199 - for (cp = saved_command_line; *cp; ) { 200 + for (cp = boot_command_line; *cp; ) { 200 201 if (memcmp(cp, "nointroute", 10) == 0) { 201 202 no_int_routing = 1; 202 203 printk ("no_int_routing on\n");
+2 -2
arch/ia64/kernel/setup.c
··· 262 262 * appropriate after a kernel panic. 263 263 */ 264 264 { 265 - char *from = strstr(saved_command_line, "crashkernel="); 265 + char *from = strstr(boot_command_line, "crashkernel="); 266 266 unsigned long base, size; 267 267 if (from) { 268 268 size = memparse(from + 12, &from); ··· 463 463 ia64_patch_vtop((u64) __start___vtop_patchlist, (u64) __end___vtop_patchlist); 464 464 465 465 *cmdline_p = __va(ia64_boot_param->command_line); 466 - strlcpy(saved_command_line, *cmdline_p, COMMAND_LINE_SIZE); 466 + strlcpy(boot_command_line, *cmdline_p, COMMAND_LINE_SIZE); 467 467 468 468 efi_init(); 469 469 io_port_init();