aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/kernel/efi.c
diff options
context:
space:
mode:
authorAlon Bar-Lev <alon.barlev@gmail.com>2007-02-12 03:54:12 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-12 12:48:38 -0500
commita8d91b8477aa433ee0131b031d782411976e1726 (patch)
tree56e0f08c7da71cbc278721def52819fe33989f3d /arch/ia64/kernel/efi.c
parent4e498b66104af914ef04d6e7fbbbc13a4f7c936e (diff)
[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>
Diffstat (limited to 'arch/ia64/kernel/efi.c')
-rw-r--r--arch/ia64/kernel/efi.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c
index 6c03928544c..b12d6d13202 100644
--- a/arch/ia64/kernel/efi.c
+++ b/arch/ia64/kernel/efi.c
@@ -405,6 +405,8 @@ efi_map_pal_code (void)
405 ia64_srlz_i(); 405 ia64_srlz_i();
406} 406}
407 407
408extern char __initdata boot_command_line[];
409
408void __init 410void __init
409efi_init (void) 411efi_init (void)
410{ 412{
@@ -413,11 +415,10 @@ efi_init (void)
413 efi_char16_t *c16; 415 efi_char16_t *c16;
414 u64 efi_desc_size; 416 u64 efi_desc_size;
415 char *cp, vendor[100] = "unknown"; 417 char *cp, vendor[100] = "unknown";
416 extern char saved_command_line[];
417 int i; 418 int i;
418 419
419 /* it's too early to be able to use the standard kernel command line support... */ 420 /* it's too early to be able to use the standard kernel command line support... */
420 for (cp = saved_command_line; *cp; ) { 421 for (cp = boot_command_line; *cp; ) {
421 if (memcmp(cp, "mem=", 4) == 0) { 422 if (memcmp(cp, "mem=", 4) == 0) {
422 mem_limit = memparse(cp + 4, &cp); 423 mem_limit = memparse(cp + 4, &cp);
423 } else if (memcmp(cp, "max_addr=", 9) == 0) { 424 } else if (memcmp(cp, "max_addr=", 9) == 0) {