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 15/26] Dynamic kernel command-line - parisc
    Date

    1. Rename saved_command_line into boot_command_line.
    2. Set command_line as __initdata.

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

    ---

    diff -urNp linux-2.6.19.org/arch/parisc/kernel/setup.c linux-2.6.19/arch/parisc/kernel/setup.c
    --- linux-2.6.19.org/arch/parisc/kernel/setup.c 2006-11-29 23:57:37.000000000 +0200
    +++ linux-2.6.19/arch/parisc/kernel/setup.c 2006-12-02 11:31:33.000000000 +0200
    @@ -45,7 +45,7 @@
    #include <asm/io.h>
    #include <asm/setup.h>

    -char command_line[COMMAND_LINE_SIZE] __read_mostly;
    +char __initdata command_line[COMMAND_LINE_SIZE] __read_mostly;

    /* Intended for ccio/sba/cpu statistics under /proc/bus/{runway|gsc} */
    struct proc_dir_entry * proc_runway_root __read_mostly = NULL;
    @@ -71,9 +71,9 @@ void __init setup_cmdline(char **cmdline
    /* boot_args[0] is free-mem start, boot_args[1] is ptr to command line */
    if (boot_args[0] < 64) {
    /* called from hpux boot loader */
    - saved_command_line[0] = '\0';
    + boot_command_line[0] = '\0';
    } else {
    - strcpy(saved_command_line, (char *)__va(boot_args[1]));
    + strcpy(boot_command_line, (char *)__va(boot_args[1]));

    #ifdef CONFIG_BLK_DEV_INITRD
    if (boot_args[2] != 0) /* did palo pass us a ramdisk? */
    @@ -84,7 +84,7 @@ void __init setup_cmdline(char **cmdline
    #endif
    }

    - strcpy(command_line, saved_command_line);
    + strcpy(command_line, boot_command_line);
    *cmdline_p = command_line;
    }

    diff -urNp linux-2.6.19.org/arch/parisc/mm/init.c linux-2.6.19/arch/parisc/mm/init.c
    --- linux-2.6.19.org/arch/parisc/mm/init.c 2006-11-29 23:57:37.000000000 +0200
    +++ linux-2.6.19/arch/parisc/mm/init.c 2006-12-02 11:31:33.000000000 +0200
    @@ -77,12 +77,12 @@ static void __init mem_limit_func(void)
    {
    char *cp, *end;
    unsigned long limit;
    - extern char saved_command_line[];
    + extern char __initdata boot_command_line[];

    /* We need this before __setup() functions are called */

    limit = MAX_MEM;
    - for (cp = saved_command_line; *cp; ) {
    + for (cp = boot_command_line; *cp; ) {
    if (memcmp(cp, "mem=", 4) == 0) {
    cp += 4;
    limit = memparse(cp, &end);
    -
    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.030 / U:31.564 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site