2009-09-15 21:37:13

by Hugh Dickins

[permalink] [raw]
Subject: mmotm on powerpc: walk_memory_resource?

Recent mmotm builds on powerpc have been failing with

arch/powerpc/mm/mem.c:169: error: ‘walk_memory_resource’ undeclared here (not in a function)
cc1: warnings being treated as errors
arch/powerpc/mm/mem.c:169: error: type defaults to ‘int’ in declaration of ‘walk_memory_resource’
make[1]: *** [arch/powerpc/mm/mem.o] Error 1

because walk-system-ram-range.patch renames walk_memory_resource()
but leaves the EXPORT_SYMBOL_GPL(walk_memory_resource). I couldn't
tell from the patch description whether it's a matter of changing
the EXPORT_SYMBOL_GPL or removing the patch to arch/powerpc/mm/mem.c
or something else. (I change the EXPORT to get my build working,
but there appears to be something in drivers/infiniband which still
wants a walk_memory_resource.)

Hugh


2009-09-15 23:55:32

by Kamezawa Hiroyuki

[permalink] [raw]
Subject: Re: mmotm on powerpc: walk_memory_resource?

On Tue, 15 Sep 2009 22:36:26 +0100 (BST)
Hugh Dickins <[email protected]> wrote:

> Recent mmotm builds on powerpc have been failing with
>
> arch/powerpc/mm/mem.c:169: error: $B!F(Bwalk_memory_resource$B!G(B undeclared here (not in a function)
> cc1: warnings being treated as errors
> arch/powerpc/mm/mem.c:169: error: type defaults to $B!F(Bint$B!G(B in declaration of $B!F(Bwalk_memory_resource$B!G(B
> make[1]: *** [arch/powerpc/mm/mem.o] Error 1
>
> because walk-system-ram-range.patch renames walk_memory_resource()
> but leaves the EXPORT_SYMBOL_GPL(walk_memory_resource). I couldn't
> tell from the patch description whether it's a matter of changing
> the EXPORT_SYMBOL_GPL or removing the patch to arch/powerpc/mm/mem.c
> or something else. (I change the EXPORT to get my build working,
> but there appears to be something in drivers/infiniband which still
> wants a walk_memory_resource.)
>

Very sorry..my mistake. Will fix it immedieately.

-Kame

> Hugh

2009-09-16 00:28:50

by Kamezawa Hiroyuki

[permalink] [raw]
Subject: [BUGFIX][mmotm] fix walk system ram range patch (Was Re: mmotm on powerpc: walk_memory_resource?

On Tue, 15 Sep 2009 22:36:26 +0100 (BST)
Hugh Dickins <[email protected]> wrote:

> Recent mmotm builds on powerpc have been failing with
>
> arch/powerpc/mm/mem.c:169: error: $B!F(Bwalk_memory_resource$B!G(B undeclared here (not in a function)
> cc1: warnings being treated as errors
> arch/powerpc/mm/mem.c:169: error: type defaults to $B!F(Bint$B!G(B in declaration of $B!F(Bwalk_memory_resource$B!G(B
> make[1]: *** [arch/powerpc/mm/mem.o] Error 1
>
Thank you for pointing out.
-Kame
==


walk-system-ram-range.patch renames walk_memory_resource()
to be walk_system_ram_range().
But powerpc has its own one and it's exported.
(Because ehea driver (IBM's one) uses this, powerpc export this.)

> arch/powerpc/mm/mem.c:169: error: $B!F(Bwalk_memory_resource$B!G(B undeclared here (not in a function)
> cc1: warnings being treated as errors
> arch/powerpc/mm/mem.c:169: error: type defaults to $B!F(Bint$B!G(B in declaration of $B!F(Bwalk_memory_resource$B!G(B
> make[1]: *** [arch/powerpc/mm/mem.o] Error 1
>
The patch failed to update powerpc's EXPORT_SYMBOL, this patch fixes it.

Reported-by: Hugh Dickins <[email protected]>
Signed-off-by: KAMEZAWA Hiroyuki <[email protected]>

---
arch/powerpc/mm/mem.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Index: mmotm-2.6.31-Sep14/arch/powerpc/mm/mem.c
===================================================================
--- mmotm-2.6.31-Sep14.orig/arch/powerpc/mm/mem.c
+++ mmotm-2.6.31-Sep14/arch/powerpc/mm/mem.c
@@ -166,7 +166,7 @@ walk_system_ram_range(unsigned long star
}
return ret;
}
-EXPORT_SYMBOL_GPL(walk_memory_resource);
+EXPORT_SYMBOL_GPL(walk_system_ram_range);

/*
* Initialize the bootmem system and give it all the memory we

2009-09-16 06:16:53

by David Rientjes

[permalink] [raw]
Subject: Re: [BUGFIX][mmotm] fix walk system ram range patch (Was Re: mmotm on powerpc: walk_memory_resource?

On Wed, 16 Sep 2009, KAMEZAWA Hiroyuki wrote:

> Index: mmotm-2.6.31-Sep14/arch/powerpc/mm/mem.c
> ===================================================================
> --- mmotm-2.6.31-Sep14.orig/arch/powerpc/mm/mem.c
> +++ mmotm-2.6.31-Sep14/arch/powerpc/mm/mem.c
> @@ -166,7 +166,7 @@ walk_system_ram_range(unsigned long star
> }
> return ret;
> }
> -EXPORT_SYMBOL_GPL(walk_memory_resource);
> +EXPORT_SYMBOL_GPL(walk_system_ram_range);
>
> /*
> * Initialize the bootmem system and give it all the memory we
>

Um, doesn't drivers/infiniband/hw/ehca/ehca_mrmw.c need to be fixed too?

2009-09-16 06:46:50

by Kamezawa Hiroyuki

[permalink] [raw]
Subject: [BUGFIX] fix walk systm ram range for infiniband (Was Re: [BUGFIX][mmotm] fix walk system ram range patch (Was Re: mmotm on powerpc: walk_memory_resource?

On Tue, 15 Sep 2009 23:16:47 -0700 (PDT)
David Rientjes <[email protected]> wrote:

> On Wed, 16 Sep 2009, KAMEZAWA Hiroyuki wrote:
>
> > Index: mmotm-2.6.31-Sep14/arch/powerpc/mm/mem.c
> > ===================================================================
> > --- mmotm-2.6.31-Sep14.orig/arch/powerpc/mm/mem.c
> > +++ mmotm-2.6.31-Sep14/arch/powerpc/mm/mem.c
> > @@ -166,7 +166,7 @@ walk_system_ram_range(unsigned long star
> > }
> > return ret;
> > }
> > -EXPORT_SYMBOL_GPL(walk_memory_resource);
> > +EXPORT_SYMBOL_GPL(walk_system_ram_range);
> >
> > /*
> > * Initialize the bootmem system and give it all the memory we
> >
>
> Um, doesn't drivers/infiniband/hw/ehca/ehca_mrmw.c need to be fixed too?
>
Hmm?..yes. nice catch...
my GTAGS doesn't catch it...maybe need to be updated..
I'm sorry that I didn't imagine this is widely used because this was under
CONFIG_MEMORY_HOTPLUG....

How about this ?
==
walk-system-ram-range.patch failes to catch recent change in
inifiniband. This is a fix.

Signed-off-by: KAMEZAWA Hiroyuki <[email protected]>

---
drivers/infiniband/hw/ehca/ehca_mrmw.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Index: mmotm-2.6.31-Sep14/drivers/infiniband/hw/ehca/ehca_mrmw.c
===================================================================
--- mmotm-2.6.31-Sep14.orig/drivers/infiniband/hw/ehca/ehca_mrmw.c
+++ mmotm-2.6.31-Sep14/drivers/infiniband/hw/ehca/ehca_mrmw.c
@@ -2463,7 +2463,7 @@ int ehca_create_busmap(void)
int ret;

ehca_mr_len = 0;
- ret = walk_memory_resource(0, 1ULL << MAX_PHYSMEM_BITS, NULL,
+ ret = walk_system_ram_range(0, 1ULL << MAX_PHYSMEM_BITS, NULL,
ehca_create_busmap_callback);
return ret;
}



2009-09-16 08:25:14

by Cong Wang

[permalink] [raw]
Subject: Re: [BUGFIX][mmotm] fix walk system ram range patch (Was Re: mmotm on powerpc: walk_memory_resource?

2009/9/16 KAMEZAWA Hiroyuki <[email protected]>:
> On Tue, 15 Sep 2009 22:36:26 +0100 (BST)
> Hugh Dickins <[email protected]> wrote:
>
>> Recent mmotm builds on powerpc have been failing with
>>
>> arch/powerpc/mm/mem.c:169: error: ‘walk_memory_resource’ undeclared here (not in a function)
>> cc1: warnings being treated as errors
>> arch/powerpc/mm/mem.c:169: error: type defaults to ‘int’ in declaration of ‘walk_memory_resource’
>> make[1]: *** [arch/powerpc/mm/mem.o] Error 1
>>
> Thank you for pointing out.
> -Kame
> ==
>
>
> walk-system-ram-range.patch renames walk_memory_resource()
> to be walk_system_ram_range().
> But powerpc has its own one and it's exported.
> (Because ehea driver (IBM's one) uses this, powerpc export this.)
>
>> arch/powerpc/mm/mem.c:169: error: ‘walk_memory_resource’ undeclared here (not in a function)
>> cc1: warnings being treated as errors
>> arch/powerpc/mm/mem.c:169: error: type defaults to ‘int’ in declaration of ‘walk_memory_resource’
>> make[1]: *** [arch/powerpc/mm/mem.o] Error 1
>>
> The patch failed to update powerpc's EXPORT_SYMBOL, this patch fixes it.
>
> Reported-by: Hugh Dickins <[email protected]>
> Signed-off-by: KAMEZAWA Hiroyuki <[email protected]>


Acked-by: WANG Cong <[email protected]>

>
> ---
>  arch/powerpc/mm/mem.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> Index: mmotm-2.6.31-Sep14/arch/powerpc/mm/mem.c
> ===================================================================
> --- mmotm-2.6.31-Sep14.orig/arch/powerpc/mm/mem.c
> +++ mmotm-2.6.31-Sep14/arch/powerpc/mm/mem.c
> @@ -166,7 +166,7 @@ walk_system_ram_range(unsigned long star
>        }
>        return ret;
>  }
> -EXPORT_SYMBOL_GPL(walk_memory_resource);
> +EXPORT_SYMBOL_GPL(walk_system_ram_range);
>
>  /*
>  * Initialize the bootmem system and give it all the memory we
>

2009-09-16 08:25:54

by Cong Wang

[permalink] [raw]
Subject: Re: [BUGFIX][mmotm] fix walk system ram range patch (Was Re: mmotm on powerpc: walk_memory_resource?

On Wed, Sep 16, 2009 at 2:16 PM, David Rientjes <[email protected]> wrote:
> On Wed, 16 Sep 2009, KAMEZAWA Hiroyuki wrote:
>
>> Index: mmotm-2.6.31-Sep14/arch/powerpc/mm/mem.c
>> ===================================================================
>> --- mmotm-2.6.31-Sep14.orig/arch/powerpc/mm/mem.c
>> +++ mmotm-2.6.31-Sep14/arch/powerpc/mm/mem.c
>> @@ -166,7 +166,7 @@ walk_system_ram_range(unsigned long star
>>       }
>>       return ret;
>>  }
>> -EXPORT_SYMBOL_GPL(walk_memory_resource);
>> +EXPORT_SYMBOL_GPL(walk_system_ram_range);
>>
>>  /*
>>   * Initialize the bootmem system and give it all the memory we
>>
>
> Um, doesn't drivers/infiniband/hw/ehca/ehca_mrmw.c need to be fixed too?

Yes, all callers of walk_memory_resource() should be fixed.