[PATCH] Dynamic kernel command-line: ppc

Rename saved_command_line into boot_command_line.

Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c
index 3c506af..c79704f 100644 (file)
--- a/arch/ppc/kernel/setup.c
+++ b/arch/ppc/kernel/setup.c
@@ -543,7 +543,7 @@ void __init setup_arch(char **cmdline_p)
        init_mm.brk = (unsigned long) klimit;
 
        /* Save unparsed command line copy for /proc/cmdline */
-       strlcpy(saved_command_line, cmd_line, COMMAND_LINE_SIZE);
+       strlcpy(boot_command_line, cmd_line, COMMAND_LINE_SIZE);
        *cmdline_p = cmd_line;
 
        parse_early_param();

diff --git a/arch/ppc/platforms/lopec.c b/arch/ppc/platforms/lopec.c
index 18dc6e8..b947c77 100644 (file)
--- a/arch/ppc/platforms/lopec.c
+++ b/arch/ppc/platforms/lopec.c
@@ -344,7 +344,7 @@ lopec_setup_arch(void)
                 if (bootargs != NULL) {
                         strcpy(cmd_line, bootargs);
                         /* again.. */
-                        strcpy(saved_command_line, cmd_line);
+                        strcpy(boot_command_line, cmd_line);
                }
        }
 #endif

diff --git a/arch/ppc/platforms/pplus.c b/arch/ppc/platforms/pplus.c
index 9778105..8a1788c 100644 (file)
--- a/arch/ppc/platforms/pplus.c
+++ b/arch/ppc/platforms/pplus.c
@@ -592,7 +592,7 @@ static void __init pplus_setup_arch(void)
                if (bootargs != NULL) {
                        strcpy(cmd_line, bootargs);
                        /* again.. */
-                       strcpy(saved_command_line, cmd_line);
+                       strcpy(boot_command_line, cmd_line);
                }
        }
 #endif

diff --git a/arch/ppc/platforms/prep_setup.c b/arch/ppc/platforms/prep_setup.c
index 1cb75a1..f166299 100644 (file)
--- a/arch/ppc/platforms/prep_setup.c
+++ b/arch/ppc/platforms/prep_setup.c
@@ -634,7 +634,7 @@ static void __init prep_init_sound(void)
        /*
         * Find a way to push these informations to the cs4232 driver
         * Give it out with printk, when not in cmd_line?
-        * Append it to  cmd_line and saved_command_line?
+        * Append it to  cmd_line and boot_command_line?
         * Format is cs4232=io,irq,dma,dma2
         */
 }
@@ -897,7 +897,7 @@ prep_setup_arch(void)
                 if (bootargs != NULL) {
                         strcpy(cmd_line, bootargs);
                         /* again.. */
-                        strcpy(saved_command_line, cmd_line);
+                        strcpy(boot_command_line, cmd_line);
                }
        }