lkml.org 
[lkml]   [2006]   [Dec]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 16/26] Dynamic kernel command-line - powerpc
    Date

    Rename saved_command_line into boot_command_line.

    Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>

    ---

    diff -urNp linux-2.6.19.org/arch/powerpc/kernel/legacy_serial.c linux-2.6.19/arch/powerpc/kernel/legacy_serial.c
    --- linux-2.6.19.org/arch/powerpc/kernel/legacy_serial.c 2006-11-29 23:57:37.000000000 +0200
    +++ linux-2.6.19/arch/powerpc/kernel/legacy_serial.c 2006-12-02 11:31:33.000000000 +0200
    @@ -498,7 +498,7 @@ static int __init check_legacy_serial_co
    DBG(" -> check_legacy_serial_console()\n");

    /* The user has requested a console so this is already set up. */
    - if (strstr(saved_command_line, "console=")) {
    + if (strstr(boot_command_line, "console=")) {
    DBG(" console was specified !\n");
    return -EBUSY;
    }
    diff -urNp linux-2.6.19.org/arch/powerpc/kernel/prom.c linux-2.6.19/arch/powerpc/kernel/prom.c
    --- linux-2.6.19.org/arch/powerpc/kernel/prom.c 2006-11-29 23:57:37.000000000 +0200
    +++ linux-2.6.19/arch/powerpc/kernel/prom.c 2006-12-02 11:31:33.000000000 +0200
    @@ -894,7 +894,7 @@ void __init early_init_devtree(void *par
    of_scan_flat_dt(early_init_dt_scan_memory, NULL);

    /* Save command line for /proc/cmdline and then parse parameters */
    - strlcpy(saved_command_line, cmd_line, COMMAND_LINE_SIZE);
    + strlcpy(boot_command_line, cmd_line, COMMAND_LINE_SIZE);
    parse_early_param();

    /* Reserve LMB regions used by kernel, initrd, dt, etc... */
    diff -urNp linux-2.6.19.org/arch/powerpc/kernel/udbg.c linux-2.6.19/arch/powerpc/kernel/udbg.c
    --- linux-2.6.19.org/arch/powerpc/kernel/udbg.c 2006-11-29 23:57:37.000000000 +0200
    +++ linux-2.6.19/arch/powerpc/kernel/udbg.c 2006-12-02 11:31:33.000000000 +0200
    @@ -146,7 +146,7 @@ void __init disable_early_printk(void)
    {
    if (!early_console_initialized)
    return;
    - if (strstr(saved_command_line, "udbg-immortal")) {
    + if (strstr(boot_command_line, "udbg-immortal")) {
    printk(KERN_INFO "early console immortal !\n");
    return;
    }
    diff -urNp linux-2.6.19.org/arch/powerpc/platforms/powermac/setup.c linux-2.6.19/arch/powerpc/platforms/powermac/setup.c
    --- linux-2.6.19.org/arch/powerpc/platforms/powermac/setup.c 2006-11-29 23:57:37.000000000 +0200
    +++ linux-2.6.19/arch/powerpc/platforms/powermac/setup.c 2006-12-02 11:31:33.000000000 +0200
    @@ -505,8 +505,8 @@ void note_bootable_part(dev_t dev, int p
    if ((goodness <= current_root_goodness) &&
    ROOT_DEV != DEFAULT_ROOT_DEVICE)
    return;
    - p = strstr(saved_command_line, "root=");
    - if (p != NULL && (p == saved_command_line || p[-1] == ' '))
    + p = strstr(boot_command_line, "root=");
    + if (p != NULL && (p == boot_command_line || p[-1] == ' '))
    return;

    if (!found_boot) {
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2006-12-02 12:07    [W:0.025 / U:0.080 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site