Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6

[sfrench/cifs-2.6.git] / arch / parisc / kernel / setup.c

diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c
index 21b9fb17b409d53363e53211cd35d8784582279d..bd2116e03f3488695651d95b641cb2e9ca83b788 100644 (file)
--- a/arch/parisc/kernel/setup.c
+++ b/arch/parisc/kernel/setup.c
@@ -45,7 +45,7 @@
 #include <asm/io.h>
 #include <asm/setup.h>
 
 #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;
 
 /* 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_p)
        /* 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 */
        /* 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 {
        } 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? */
 
 #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_p)
 #endif
        }
 
 #endif
        }
 

-       strcpy(command_line, saved_command_line);
+       strcpy(command_line, boot_command_line);

        *cmdline_p = command_line;
 }
 
        *cmdline_p = command_line;
 }