CC-d to Christoph Lameter.
On Sat, 30 Sep 2006 03:41:39 +0900, girish <girishvg@xxxxxxxxx> wrote:
> On Sep 30, 2006, at 3:34 AM, Atsushi Nemoto wrote:
>
> > The commit f06a96844a577c43249fce25809a4fae07407f46 broke mips.
> >
> > Signed-off-by: Atsushi Nemoto <anemo@xxxxxxxxxxxxx>
> >
> > diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
> > index a624778..2f346d1 100644
> > --- a/arch/mips/mm/init.c
> > +++ b/arch/mips/mm/init.c
> > @@ -357,10 +357,10 @@ static int __init page_is_ram(unsigned l
> >
> > void __init paging_init(void)
> > {
> > - unsigned long zones_size[] = { 0, };
> > + unsigned long zones_size[MAX_NR_ZONES] = { 0, };
> > unsigned long max_dma, high, low;
> > #ifndef CONFIG_FLATMEM
> > - unsigned long zholes_size[] = { 0, };
> > + unsigned long zholes_size[MAX_NR_ZONES] = { 0, };
> > unsigned long i, j, pfn;
> > #endif
>
> Nemoto~san, this was your patch earlier.
>
> void __init paging_init(void)
> {
> - unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0};
> + unsigned long zones_size[] = { [0 ... MAX_NR_ZONES - 1] = 0 };
> unsigned long max_dma, high, low;
> +#ifdef CONFIG_SPARSEMEM
> + unsigned long zholes_size[] = { [0 ... MAX_NR_ZONES - 1] = 0 };
> + unsigned long i, j, pfn;
> +#endif
Yes. This is correct. And then there was a conflict on this commit.
> commit f06a96844a577c43249fce25809a4fae07407f46
> Author: Christoph Lameter <clameter@xxxxxxx>
> Date: Mon Sep 25 23:31:10 2006 -0700
> [PATCH] reduce MAX_NR_ZONES: fix MAX_NR_ZONES array initializations
Perhaps his original patch was:
- unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0};
+ unsigned long zones_size[MAX_NR_ZONES] = {0, };
This conflicted with my change. Unfortunately the conflict was
resolved in wrong way, thus now we have this line:
unsigned long zones_size[] = { 0, };
This time my patch is trying to get the original target.
---
Atsushi Nemoto
