powerpc: Remove powerpc specific cmd_line

There is no need for yet another copy of the command line, just
use boot_command_line like everyone else.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

8 files changed, 10 insertions, 16 deletions

diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h
index b125ceab149c..902ab203aeb2 100644
--- a/arch/powerpc/include/asm/machdep.h
+++ b/arch/powerpc/include/asm/machdep.h
@@ -330,8 +330,6 @@ extern struct machdep_calls *machine_id;
 
 extern void probe_machine(void);
 
-extern char cmd_line[COMMAND_LINE_SIZE];
-
 #ifdef CONFIG_PPC_PMAC
 /*
  * Power macintoshes have either a CUDA, PMU or SMU controlling
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 59576255d22b..099f27e6d1b0 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -668,14 +668,12 @@ void __init early_init_devtree(void *params)
          * device-tree, including the platform type, initrd location and
          * size, TCE reserve, and more ...
          */
-        of_scan_flat_dt(early_init_dt_scan_chosen_ppc, cmd_line);
+        of_scan_flat_dt(early_init_dt_scan_chosen_ppc, boot_command_line);
 
         /* Scan memory nodes and rebuild MEMBLOCKs */
         of_scan_flat_dt(early_init_dt_scan_root, NULL);
         of_scan_flat_dt(early_init_dt_scan_memory_ppc, NULL);
 
-        /* Save command line for /proc/cmdline and then parse parameters */
-        strlcpy(boot_command_line, cmd_line, COMMAND_LINE_SIZE);
         parse_early_param();
 
         /* make sure we've parsed cmdline for mem= before this */
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index c933acd4e2bd..0df37f5e2d54 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -81,8 +81,6 @@ EXPORT_SYMBOL_GPL(boot_cpuid);
 
 unsigned long klimit = (unsigned long) _end;
 
-char cmd_line[COMMAND_LINE_SIZE];
-
 /*
  * This still seems to be needed... -- paulus
  */ 
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index ea4fda60e57b..07831ed0d9ef 100644
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -268,7 +268,7 @@ static void __init exc_lvl_early_init(void)
 /* Warning, IO base is not yet inited */
 void __init setup_arch(char **cmdline_p)
 {
-        *cmdline_p = cmd_line;
+        *cmdline_p = boot_command_line;
 
         /* so udelay does something sensible, assume <= 1000 bogomips */
         loops_per_jiffy = 500000000 / HZ;
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 2ef9893a06bd..cd07d79ad21c 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -667,7 +667,7 @@ void __init setup_arch(char **cmdline_p)
 {
         ppc64_boot_msg(0x12, "Setup Arch");
 
-        *cmdline_p = cmd_line;
+        *cmdline_p = boot_command_line;
 
         /*
          * Set cache line size based on type of cpu as a default.
diff --git a/arch/powerpc/mm/init_32.c b/arch/powerpc/mm/init_32.c
index cff59f1bec23..cad68ff8eca5 100644
--- a/arch/powerpc/mm/init_32.c
+++ b/arch/powerpc/mm/init_32.c
@@ -106,11 +106,11 @@ unsigned long __max_low_memory = MAX_LOW_MEM;
 void MMU_setup(void)
 {
         /* Check for nobats option (used in mapin_ram). */
-        if (strstr(cmd_line, "nobats")) {
+        if (strstr(boot_command_line, "nobats")) {
                 __map_without_bats = 1;
         }
 
-        if (strstr(cmd_line, "noltlbs")) {
+        if (strstr(boot_command_line, "noltlbs")) {
                 __map_without_ltlbs = 1;
         }
 #ifdef CONFIG_DEBUG_PAGEALLOC
diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c
index 7044fd36197b..5b77b1919fd2 100644
--- a/arch/powerpc/platforms/chrp/setup.c
+++ b/arch/powerpc/platforms/chrp/setup.c
@@ -258,7 +258,7 @@ static void chrp_init_early(void)
         struct device_node *node;
         const char *property;
 
-        if (strstr(cmd_line, "console="))
+        if (strstr(boot_command_line, "console="))
                 return;
         /* find the boot console from /chosen/stdout */
         if (!of_chosen)
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index 141f8899a633..b127a29ac526 100644
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -336,7 +336,7 @@ static void __init pmac_setup_arch(void)
 #endif
 
 #ifdef CONFIG_ADB
-        if (strstr(cmd_line, "adb_sync")) {
+        if (strstr(boot_command_line, "adb_sync")) {
                 extern int __adb_probe_sync;
                 __adb_probe_sync = 1;
         }
@@ -460,7 +460,7 @@ pmac_halt(void)
 static void __init pmac_init_early(void)
 {
         /* Enable early btext debug if requested */
-        if (strstr(cmd_line, "btextdbg")) {
+        if (strstr(boot_command_line, "btextdbg")) {
                 udbg_adb_init_early();
                 register_early_udbg_console();
         }
@@ -469,8 +469,8 @@ static void __init pmac_init_early(void)
         pmac_feature_init();
 
         /* Initialize debug stuff */
-        udbg_scc_init(!!strstr(cmd_line, "sccdbg"));
-        udbg_adb_init(!!strstr(cmd_line, "btextdbg"));
+        udbg_scc_init(!!strstr(boot_command_line, "sccdbg"));
+        udbg_adb_init(!!strstr(boot_command_line, "btextdbg"));
 
 #ifdef CONFIG_PPC64
         iommu_init_early_dart();