* [PATCH 1/2] [POWERPC] Remove cmd_line from head*.S
@ 2007-08-23 3:09 Stephen Rothwell
2007-08-23 3:10 ` [PATCH 2/2] [POWERPC] Size swapper_pg_dir correctly Stephen Rothwell
` (3 more replies)
0 siblings, 4 replies; 10+ messages in thread
From: Stephen Rothwell @ 2007-08-23 3:09 UTC (permalink / raw)
To: paulus; +Cc: ppc-dev
It is just a C char array, so declare it thusly.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/powerpc/kernel/head_32.S | 8 --------
arch/powerpc/kernel/head_44x.S | 8 --------
arch/powerpc/kernel/head_4xx.S | 7 -------
arch/powerpc/kernel/head_64.S | 8 --------
arch/powerpc/kernel/head_8xx.S | 8 --------
arch/powerpc/kernel/head_fsl_booke.S | 8 --------
arch/powerpc/kernel/prom.c | 2 ++
7 files changed, 2 insertions(+), 47 deletions(-)
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
index 7d73a13..de2fa61 100644
--- a/arch/powerpc/kernel/head_32.S
+++ b/arch/powerpc/kernel/head_32.S
@@ -1300,14 +1300,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_44x.S b/arch/powerpc/kernel/head_44x.S
index 8869596..e4068ff 100644
--- a/arch/powerpc/kernel/head_44x.S
+++ b/arch/powerpc/kernel/head_44x.S
@@ -744,14 +744,6 @@ exception_stack_bottom:
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_4xx.S b/arch/powerpc/kernel/head_4xx.S
index adc7f80..958805b 100644
--- a/arch/powerpc/kernel/head_4xx.S
+++ b/arch/powerpc/kernel/head_4xx.S
@@ -1007,13 +1007,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_64.S b/arch/powerpc/kernel/head_64.S
index 33c4e8c..381d07a 100644
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
@@ -1538,11 +1538,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 901be47..22e1a3c 100644
--- a/arch/powerpc/kernel/head_8xx.S
+++ b/arch/powerpc/kernel/head_8xx.S
@@ -835,14 +835,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 1f155d3..5f47adb 100644
--- a/arch/powerpc/kernel/head_fsl_booke.S
+++ b/arch/powerpc/kernel/head_fsl_booke.S
@@ -1050,14 +1050,6 @@ exception_stack_bottom:
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/prom.c b/arch/powerpc/kernel/prom.c
index 0028fe6..dc85005 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -60,6 +60,8 @@
#endif
+char cmd_line[COMMAND_LINE_SIZE];
+
static int __initdata dt_root_addr_cells;
static int __initdata dt_root_size_cells;
--
1.5.2.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 2/2] [POWERPC] Size swapper_pg_dir correctly
2007-08-23 3:09 [PATCH 1/2] [POWERPC] Remove cmd_line from head*.S Stephen Rothwell
@ 2007-08-23 3:10 ` Stephen Rothwell
2007-08-23 3:13 ` David Gibson
2007-08-23 3:26 ` Kumar Gala
2007-08-23 3:13 ` [PATCH 1/2] [POWERPC] Remove cmd_line from head*.S David Gibson
` (2 subsequent siblings)
3 siblings, 2 replies; 10+ messages in thread
From: Stephen Rothwell @ 2007-08-23 3:10 UTC (permalink / raw)
To: paulus; +Cc: ppc-dev
David Gibson pointed out that swapper_pg_dir actually need to be
PGD_TABLE_SIZE bytes long not PAGE_SIZE. This actually saves 64k in
the bss for a ppc64_defconfig kernel built with CONFIG_PPC_64K_PAGES.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/powerpc/kernel/asm-offsets.c | 4 ++++
arch/powerpc/kernel/head_64.S | 2 +-
include/asm-powerpc/pgtable-4k.h | 2 ++
include/asm-powerpc/pgtable-64k.h | 2 ++
4 files changed, 9 insertions(+), 1 deletions(-)
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
index a408053..0ae5d57 100644
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@ -320,5 +320,9 @@ int main(void)
DEFINE(VMALLOC_START_ESID, GET_ESID(VMALLOC_START));
DEFINE(VMALLOC_START_VSID, KERNEL_VSID(VMALLOC_START));
#endif
+
+#ifdef CONFIG_PPC64
+ DEFINE(PGD_TABLE_SIZE, PGD_TABLE_SIZE);
+#endif
return 0;
}
diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
index 381d07a..a8e2348 100644
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
@@ -1537,4 +1537,4 @@ empty_zero_page:
.globl swapper_pg_dir
swapper_pg_dir:
- .space PAGE_SIZE
+ .space PGD_TABLE_SIZE
diff --git a/include/asm-powerpc/pgtable-4k.h b/include/asm-powerpc/pgtable-4k.h
index add5481..818e2ab 100644
--- a/include/asm-powerpc/pgtable-4k.h
+++ b/include/asm-powerpc/pgtable-4k.h
@@ -10,10 +10,12 @@
#define PUD_INDEX_SIZE 7
#define PGD_INDEX_SIZE 9
+#ifndef __ASSEMBLY__
#define PTE_TABLE_SIZE (sizeof(pte_t) << PTE_INDEX_SIZE)
#define PMD_TABLE_SIZE (sizeof(pmd_t) << PMD_INDEX_SIZE)
#define PUD_TABLE_SIZE (sizeof(pud_t) << PUD_INDEX_SIZE)
#define PGD_TABLE_SIZE (sizeof(pgd_t) << PGD_INDEX_SIZE)
+#endif /* __ASSEMBLY__ */
#define PTRS_PER_PTE (1 << PTE_INDEX_SIZE)
#define PTRS_PER_PMD (1 << PMD_INDEX_SIZE)
diff --git a/include/asm-powerpc/pgtable-64k.h b/include/asm-powerpc/pgtable-64k.h
index 33ae901..bd54b77 100644
--- a/include/asm-powerpc/pgtable-64k.h
+++ b/include/asm-powerpc/pgtable-64k.h
@@ -9,9 +9,11 @@
#define PUD_INDEX_SIZE 0
#define PGD_INDEX_SIZE 4
+#ifndef __ASSEMBLY__
#define PTE_TABLE_SIZE (sizeof(real_pte_t) << PTE_INDEX_SIZE)
#define PMD_TABLE_SIZE (sizeof(pmd_t) << PMD_INDEX_SIZE)
#define PGD_TABLE_SIZE (sizeof(pgd_t) << PGD_INDEX_SIZE)
+#endif /* __ASSEMBLY__ */
#define PTRS_PER_PTE (1 << PTE_INDEX_SIZE)
#define PTRS_PER_PMD (1 << PMD_INDEX_SIZE)
--
1.5.2.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH 2/2] [POWERPC] Size swapper_pg_dir correctly
2007-08-23 3:10 ` [PATCH 2/2] [POWERPC] Size swapper_pg_dir correctly Stephen Rothwell
@ 2007-08-23 3:13 ` David Gibson
2007-08-23 3:26 ` Kumar Gala
1 sibling, 0 replies; 10+ messages in thread
From: David Gibson @ 2007-08-23 3:13 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: ppc-dev, paulus
On Thu, Aug 23, 2007 at 01:10:32PM +1000, Stephen Rothwell wrote:
> David Gibson pointed out that swapper_pg_dir actually need to be
> PGD_TABLE_SIZE bytes long not PAGE_SIZE. This actually saves 64k in
> the bss for a ppc64_defconfig kernel built with CONFIG_PPC_64K_PAGES.
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/2] [POWERPC] Size swapper_pg_dir correctly
2007-08-23 3:10 ` [PATCH 2/2] [POWERPC] Size swapper_pg_dir correctly Stephen Rothwell
2007-08-23 3:13 ` David Gibson
@ 2007-08-23 3:26 ` Kumar Gala
2007-08-23 6:13 ` Stephen Rothwell
1 sibling, 1 reply; 10+ messages in thread
From: Kumar Gala @ 2007-08-23 3:26 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: ppc-dev, paulus
On Aug 22, 2007, at 10:10 PM, Stephen Rothwell wrote:
> David Gibson pointed out that swapper_pg_dir actually need to be
> PGD_TABLE_SIZE bytes long not PAGE_SIZE. This actually saves 64k in
> the bss for a ppc64_defconfig kernel built with CONFIG_PPC_64K_PAGES.
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> arch/powerpc/kernel/asm-offsets.c | 4 ++++
> arch/powerpc/kernel/head_64.S | 2 +-
> include/asm-powerpc/pgtable-4k.h | 2 ++
> include/asm-powerpc/pgtable-64k.h | 2 ++
> 4 files changed, 9 insertions(+), 1 deletions(-)
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/
> kernel/asm-offsets.c
> index a408053..0ae5d57 100644
> --- a/arch/powerpc/kernel/asm-offsets.c
> +++ b/arch/powerpc/kernel/asm-offsets.c
> @@ -320,5 +320,9 @@ int main(void)
> DEFINE(VMALLOC_START_ESID, GET_ESID(VMALLOC_START));
> DEFINE(VMALLOC_START_VSID, KERNEL_VSID(VMALLOC_START));
> #endif
> +
> +#ifdef CONFIG_PPC64
> + DEFINE(PGD_TABLE_SIZE, PGD_TABLE_SIZE);
> +#endif
Why limit this to ppc64? The cleanup should be reasonable for all ppc.
- k
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/2] [POWERPC] Size swapper_pg_dir correctly
2007-08-23 3:26 ` Kumar Gala
@ 2007-08-23 6:13 ` Stephen Rothwell
2007-08-23 13:17 ` Kumar Gala
0 siblings, 1 reply; 10+ messages in thread
From: Stephen Rothwell @ 2007-08-23 6:13 UTC (permalink / raw)
To: Kumar Gala; +Cc: ppc-dev, paulus
[-- Attachment #1: Type: text/plain, Size: 626 bytes --]
On Wed, 22 Aug 2007 22:26:35 -0500 Kumar Gala <galak@kernel.crashing.org> wrote:
>
> > +#ifdef CONFIG_PPC64
> > + DEFINE(PGD_TABLE_SIZE, PGD_TABLE_SIZE);
> > +#endif
>
> Why limit this to ppc64? The cleanup should be reasonable for all ppc.
Because PGD_TABLE_SIZE only exists for ppc64 :-) for ppc32 the
swapper_pg_dir will always be 1 page, right?
So we could have
#define PGD_TABLE_SIZE PAGE_SIZE
for 32 bit and then go around and change the swapper_pg_dir's, but that
would be a separate patch.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/2] [POWERPC] Size swapper_pg_dir correctly
2007-08-23 6:13 ` Stephen Rothwell
@ 2007-08-23 13:17 ` Kumar Gala
0 siblings, 0 replies; 10+ messages in thread
From: Kumar Gala @ 2007-08-23 13:17 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: ppc-dev, paulus
On Aug 23, 2007, at 1:13 AM, Stephen Rothwell wrote:
> On Wed, 22 Aug 2007 22:26:35 -0500 Kumar Gala
> <galak@kernel.crashing.org> wrote:
>>
>>> +#ifdef CONFIG_PPC64
>>> + DEFINE(PGD_TABLE_SIZE, PGD_TABLE_SIZE);
>>> +#endif
>>
>> Why limit this to ppc64? The cleanup should be reasonable for all
>> ppc.
>
> Because PGD_TABLE_SIZE only exists for ppc64 :-) for ppc32 the
> swapper_pg_dir will always be 1 page, right?
No, it can be 2 pages if we do > 32-bit physical on 44x/fsl_booke.
> So we could have
> #define PGD_TABLE_SIZE PAGE_SIZE
> for 32 bit and then go around and change the swapper_pg_dir's, but
> that
> would be a separate patch.
- k
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/2] [POWERPC] Remove cmd_line from head*.S
2007-08-23 3:09 [PATCH 1/2] [POWERPC] Remove cmd_line from head*.S Stephen Rothwell
2007-08-23 3:10 ` [PATCH 2/2] [POWERPC] Size swapper_pg_dir correctly Stephen Rothwell
@ 2007-08-23 3:13 ` David Gibson
2007-08-23 3:27 ` Kumar Gala
2007-08-23 4:05 ` Stephen Rothwell
3 siblings, 0 replies; 10+ messages in thread
From: David Gibson @ 2007-08-23 3:13 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: ppc-dev, paulus
On Thu, Aug 23, 2007 at 01:09:13PM +1000, Stephen Rothwell wrote:
> It is just a C char array, so declare it thusly.
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/2] [POWERPC] Remove cmd_line from head*.S
2007-08-23 3:09 [PATCH 1/2] [POWERPC] Remove cmd_line from head*.S Stephen Rothwell
2007-08-23 3:10 ` [PATCH 2/2] [POWERPC] Size swapper_pg_dir correctly Stephen Rothwell
2007-08-23 3:13 ` [PATCH 1/2] [POWERPC] Remove cmd_line from head*.S David Gibson
@ 2007-08-23 3:27 ` Kumar Gala
2007-08-23 23:17 ` Milton Miller
2007-08-23 4:05 ` Stephen Rothwell
3 siblings, 1 reply; 10+ messages in thread
From: Kumar Gala @ 2007-08-23 3:27 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: ppc-dev, paulus
On Aug 22, 2007, at 10:09 PM, Stephen Rothwell wrote:
> It is just a C char array, so declare it thusly.
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> arch/powerpc/kernel/head_32.S | 8 --------
> arch/powerpc/kernel/head_44x.S | 8 --------
> arch/powerpc/kernel/head_4xx.S | 7 -------
> arch/powerpc/kernel/head_64.S | 8 --------
> arch/powerpc/kernel/head_8xx.S | 8 --------
> arch/powerpc/kernel/head_fsl_booke.S | 8 --------
> arch/powerpc/kernel/prom.c | 2 ++
> 7 files changed, 2 insertions(+), 47 deletions(-)
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
[snip]
> diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
> index 0028fe6..dc85005 100644
> --- a/arch/powerpc/kernel/prom.c
> +++ b/arch/powerpc/kernel/prom.c
> @@ -60,6 +60,8 @@
> #endif
>
>
> +char cmd_line[COMMAND_LINE_SIZE];
> +
would this be better in setup-common.c?
> static int __initdata dt_root_addr_cells;
> static int __initdata dt_root_size_cells;
>
- k
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/2] [POWERPC] Remove cmd_line from head*.S
2007-08-23 3:27 ` Kumar Gala
@ 2007-08-23 23:17 ` Milton Miller
0 siblings, 0 replies; 10+ messages in thread
From: Milton Miller @ 2007-08-23 23:17 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linuxppc-dev, Paul Mackerras
On Thu Aug 23 13:27:31 EST 2007, Kumar Gala wrote:
> On Aug 22, 2007, at 10:09 PM, Stephen Rothwell wrote:
>>
>> diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
>> index 0028fe6..dc85005 100644
>> --- a/arch/powerpc/kernel/prom.c
>> +++ b/arch/powerpc/kernel/prom.c
>> @@ -60,6 +60,8 @@
>> #endif
>>
>>
>> +char cmd_line[COMMAND_LINE_SIZE];
>> +
>
> would this be better in setup-common.c?
>
I strongly agree with Kumar. It doesn't belong in prom.c
milton
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 1/2] [POWERPC] Remove cmd_line from head*.S
2007-08-23 3:09 [PATCH 1/2] [POWERPC] Remove cmd_line from head*.S Stephen Rothwell
` (2 preceding siblings ...)
2007-08-23 3:27 ` Kumar Gala
@ 2007-08-23 4:05 ` Stephen Rothwell
3 siblings, 0 replies; 10+ messages in thread
From: Stephen Rothwell @ 2007-08-23 4:05 UTC (permalink / raw)
To: paulus; +Cc: ppc-dev
It is just a C char array, so declare it thusly.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/powerpc/kernel/head_32.S | 8 --------
arch/powerpc/kernel/head_40x.S | 7 -------
arch/powerpc/kernel/head_44x.S | 8 --------
arch/powerpc/kernel/head_64.S | 8 --------
arch/powerpc/kernel/head_8xx.S | 8 --------
arch/powerpc/kernel/head_fsl_booke.S | 8 --------
arch/powerpc/kernel/prom.c | 2 ++
7 files changed, 2 insertions(+), 47 deletions(-)
This is just rebased on Paulus' current tree as someone renamed head_4xx.S.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
index 7d73a13..de2fa61 100644
--- a/arch/powerpc/kernel/head_32.S
+++ b/arch/powerpc/kernel/head_32.S
@@ -1300,14 +1300,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 a8e0457..8a69eec 100644
--- 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 8869596..e4068ff 100644
--- a/arch/powerpc/kernel/head_44x.S
+++ b/arch/powerpc/kernel/head_44x.S
@@ -744,14 +744,6 @@ exception_stack_bottom:
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 33c4e8c..381d07a 100644
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
@@ -1538,11 +1538,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 901be47..22e1a3c 100644
--- a/arch/powerpc/kernel/head_8xx.S
+++ b/arch/powerpc/kernel/head_8xx.S
@@ -835,14 +835,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 1f155d3..5f47adb 100644
--- a/arch/powerpc/kernel/head_fsl_booke.S
+++ b/arch/powerpc/kernel/head_fsl_booke.S
@@ -1050,14 +1050,6 @@ exception_stack_bottom:
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/prom.c b/arch/powerpc/kernel/prom.c
index 0028fe6..dc85005 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -60,6 +60,8 @@
#endif
+char cmd_line[COMMAND_LINE_SIZE];
+
static int __initdata dt_root_addr_cells;
static int __initdata dt_root_size_cells;
--
1.5.2.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2007-08-23 23:38 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-08-23 3:09 [PATCH 1/2] [POWERPC] Remove cmd_line from head*.S Stephen Rothwell
2007-08-23 3:10 ` [PATCH 2/2] [POWERPC] Size swapper_pg_dir correctly Stephen Rothwell
2007-08-23 3:13 ` David Gibson
2007-08-23 3:26 ` Kumar Gala
2007-08-23 6:13 ` Stephen Rothwell
2007-08-23 13:17 ` Kumar Gala
2007-08-23 3:13 ` [PATCH 1/2] [POWERPC] Remove cmd_line from head*.S David Gibson
2007-08-23 3:27 ` Kumar Gala
2007-08-23 23:17 ` Milton Miller
2007-08-23 4:05 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).