[POWERPC] Remove cmd_line from head*.S

It is just a C char array, so declare it thusly.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
index 12febfe43de64a9463b14006fe2113e608c484c7..c86c626cf156431210fe70cacb50771cc7f2eaf8 100644 (file)
--- a/arch/powerpc/kernel/head_32.S
+++ b/arch/powerpc/kernel/head_32.S
@@ -1297,14 +1297,6 @@ empty_zero_page:
 swapper_pg_dir:
        .space  4096
 
-/*
- * This space gets a copy of optional info passed to us by the bootstrap
- * Used to pass parameters into the kernel like root=/dev/sda1, etc.
- */
-       .globl  cmd_line
-cmd_line:
-       .space  512
-
        .globl intercept_table
 intercept_table:
        .long 0, 0, i0x200, i0x300, i0x400, 0, i0x600, i0x700

diff --git a/arch/powerpc/kernel/head_40x.S b/arch/powerpc/kernel/head_40x.S
index 00bdb6d1c724fcf4d5ebe0d713f56845035fcc37..e312824bdd980c55623a6e502b684311d8a720a5 100644 (file)
--- a/arch/powerpc/kernel/head_40x.S
+++ b/arch/powerpc/kernel/head_40x.S
@@ -1006,13 +1006,6 @@ critical_stack_top:
        .globl  exception_stack_top
 exception_stack_top:
 
-/* This space gets a copy of optional info passed to us by the bootstrap
- * which is used to pass parameters into the kernel like root=/dev/sda1, etc.
- */
-       .globl  cmd_line
-cmd_line:
-       .space  512
-
 /* Room for two PTE pointers, usually the kernel and current user pointers
  * to their respective root page table.
  */

diff --git a/arch/powerpc/kernel/head_44x.S b/arch/powerpc/kernel/head_44x.S
index a3dc0e4d0456c1e9e11fe031a40f2a5b734d0650..c6a510bdefd4793d057a314f9b8b3ba8f69dc9ed 100644 (file)
--- a/arch/powerpc/kernel/head_44x.S
+++ b/arch/powerpc/kernel/head_44x.S
@@ -743,14 +743,6 @@ exception_stack_bottom:
        .globl  exception_stack_top
 exception_stack_top:
 
-/*
- * This space gets a copy of optional info passed to us by the bootstrap
- * which is used to pass parameters into the kernel like root=/dev/sda1, etc.
- */
-       .globl  cmd_line
-cmd_line:
-       .space  512
-
 /*
  * Room for two PTE pointers, usually the kernel and current user pointers
  * to their respective root page table.

diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
index cec59089e48c056320a2fcffd35a4e5b7d66da78..f4ae82e9c92dacd3807c7bb2e3189f607681c262 100644 (file)
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
@@ -1540,11 +1540,3 @@ empty_zero_page:
        .globl  swapper_pg_dir
 swapper_pg_dir:
        .space  PAGE_SIZE
-
-/*
- * This space gets a copy of optional info passed to us by the bootstrap
- * Used to pass parameters into the kernel like root=/dev/sda1, etc.
- */
-       .globl  cmd_line
-cmd_line:
-       .space  COMMAND_LINE_SIZE

diff --git a/arch/powerpc/kernel/head_8xx.S b/arch/powerpc/kernel/head_8xx.S
index a6ecdd643167eb9c9ac12fa1788ab3ac808a6a43..96cea8e753c4ff71b0b2b80d535d3ffe24ebd6c5 100644 (file)
--- a/arch/powerpc/kernel/head_8xx.S
+++ b/arch/powerpc/kernel/head_8xx.S
@@ -832,14 +832,6 @@ empty_zero_page:
 swapper_pg_dir:
        .space  4096
 
-/*
- * This space gets a copy of optional info passed to us by the bootstrap
- * Used to pass parameters into the kernel like root=/dev/sda1, etc.
- */
-       .globl  cmd_line
-cmd_line:
-       .space  512
-
 /* Room for two PTE table poiners, usually the kernel and current user
  * pointer to their respective root page table (pgdir).
  */

diff --git a/arch/powerpc/kernel/head_fsl_booke.S b/arch/powerpc/kernel/head_fsl_booke.S
index d83cbbb264e2fbf75563839e7335825bc4e5c159..bfc38703a8ac5e5f7b4374e0a8ce185f175cf053 100644 (file)
--- a/arch/powerpc/kernel/head_fsl_booke.S
+++ b/arch/powerpc/kernel/head_fsl_booke.S
@@ -1049,14 +1049,6 @@ exception_stack_bottom:
        .globl  exception_stack_top
 exception_stack_top:
 
-/*
- * This space gets a copy of optional info passed to us by the bootstrap
- * which is used to pass parameters into the kernel like root=/dev/sda1, etc.
- */
-       .globl  cmd_line
-cmd_line:
-       .space  512
-
 /*
  * Room for two PTE pointers, usually the kernel and current user pointers
  * to their respective root page table.

diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index 50ef38cffdbfc3db60df3b3a90827daac12aef47..36c90ba2d31269a2fa32d950c1ec812c6e94264b 100644 (file)
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -76,6 +76,8 @@ EXPORT_SYMBOL(machine_id);
 
 unsigned long klimit = (unsigned long) _end;
 
+char cmd_line[COMMAND_LINE_SIZE];
+
 /*
  * This still seems to be needed... -- paulus
  */