From 387137318e561edb1e2ece03b407fd00cd1deb7f Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Mon, 23 Jun 2008 19:54:23 -0700 Subject: [PATCH] --- yaml --- r: 99888 b: refs/heads/master c: 9a2e59302668b9ac2fb2a2c9bca1fc793c5d0409 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/setup_32.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8705780451b5..3ec34b7cf7fb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7465252ea0121c9cd28be68dfb86293a7554a111 +refs/heads/master: 9a2e59302668b9ac2fb2a2c9bca1fc793c5d0409 diff --git a/trunk/arch/x86/kernel/setup_32.c b/trunk/arch/x86/kernel/setup_32.c index 52f4e01bb655..243b2f7ca137 100644 --- a/trunk/arch/x86/kernel/setup_32.c +++ b/trunk/arch/x86/kernel/setup_32.c @@ -382,6 +382,9 @@ void __init setup_arch(char **cmdline_p) bss_resource.start = virt_to_phys(&__bss_start); bss_resource.end = virt_to_phys(&__bss_stop)-1; + strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE); + *cmdline_p = command_line; + parse_setup_data(); parse_early_param(); @@ -402,9 +405,6 @@ void __init setup_arch(char **cmdline_p) insert_resource(&iomem_resource, &data_resource); insert_resource(&iomem_resource, &bss_resource); - strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE); - *cmdline_p = command_line; - if (efi_enabled) efi_init();