aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYinghai Lu <yhlu.kernel@gmail.com>2008-06-23 22:54:23 -0400
committerIngo Molnar <mingo@elte.hu>2008-07-08 06:50:26 -0400
commit9a2e59302668b9ac2fb2a2c9bca1fc793c5d0409 (patch)
treec1aa7d522397abd677e42e1f52b420eee1f4b6c4
parent7465252ea0121c9cd28be68dfb86293a7554a111 (diff)
x86: setup_arch 32bit move command line copying early
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/kernel/setup_32.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c
index 52f4e01bb655..243b2f7ca137 100644
--- a/arch/x86/kernel/setup_32.c
+++ b/arch/x86/kernel/setup_32.c
@@ -382,6 +382,9 @@ void __init setup_arch(char **cmdline_p)
382 bss_resource.start = virt_to_phys(&__bss_start); 382 bss_resource.start = virt_to_phys(&__bss_start);
383 bss_resource.end = virt_to_phys(&__bss_stop)-1; 383 bss_resource.end = virt_to_phys(&__bss_stop)-1;
384 384
385 strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);
386 *cmdline_p = command_line;
387
385 parse_setup_data(); 388 parse_setup_data();
386 389
387 parse_early_param(); 390 parse_early_param();
@@ -402,9 +405,6 @@ void __init setup_arch(char **cmdline_p)
402 insert_resource(&iomem_resource, &data_resource); 405 insert_resource(&iomem_resource, &data_resource);
403 insert_resource(&iomem_resource, &bss_resource); 406 insert_resource(&iomem_resource, &bss_resource);
404 407
405 strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);
406 *cmdline_p = command_line;
407
408 if (efi_enabled) 408 if (efi_enabled)
409 efi_init(); 409 efi_init();
410 410