lkml.org 
[lkml]   [2015]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v10 2/3] x86/setup: handle builtin command line as early as possible
    Date
    This patch adds the call of the setup_builtin_cmdline to
    handle builtin command line before we will setup earlyprintk.

    Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com>
    ---
    arch/x86/kernel/head32.c | 1 +
    arch/x86/kernel/head64.c | 2 ++
    arch/x86/kernel/setup.c | 1 -
    3 files changed, 3 insertions(+), 1 deletion(-)

    diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c
    index 2911ef3..92e8b5f 100644
    --- a/arch/x86/kernel/head32.c
    +++ b/arch/x86/kernel/head32.c
    @@ -31,6 +31,7 @@ static void __init i386_default_early_setup(void)

    asmlinkage __visible void __init i386_start_kernel(void)
    {
    + setup_builtin_cmdline();
    cr4_init_shadow();
    sanitize_boot_params(&boot_params);

    diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
    index 5a46681..1e5f064 100644
    --- a/arch/x86/kernel/head64.c
    +++ b/arch/x86/kernel/head64.c
    @@ -172,6 +172,8 @@ asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data)

    copy_bootdata(__va(real_mode_data));

    + setup_builtin_cmdline();
    +
    /*
    * Load microcode early on BSP.
    */
    diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
    index edd4857..0aeee0a 100644
    --- a/arch/x86/kernel/setup.c
    +++ b/arch/x86/kernel/setup.c
    @@ -989,8 +989,6 @@ void __init setup_arch(char **cmdline_p)
    bss_resource.start = __pa_symbol(__bss_start);
    bss_resource.end = __pa_symbol(__bss_stop)-1;

    - setup_builtin_cmdline();
    strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);
    *cmdline_p = command_line;

    --
    2.4.0.GIT


    \
     
     \ /
      Last update: 2015-06-07 16:21    [W:4.426 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site