Re: + mm-sparse-introduce-alloc_usemap_and_memmap-fix-2.patch added to -mm tree

Re: + mm-sparse-introduce-alloc_usemap_and_memmap-fix-2.patch added to -mm tree

[Yinghai Lu]

On Thu, Aug 29, 2013 at 1:29 PM,  <akpm@linux-foundation.org> wrote:
> Subject: + mm-sparse-introduce-alloc_usemap_and_memmap-fix-2.patch added to -mm tree
> To: liwanp@linux.vnet.ibm.com,yinghai@kernel.org
> From: akpm@linux-foundation.org
> Date: Thu, 29 Aug 2013 13:29:06 -0700
>
>
> The patch titled
>      Subject: mm/sparse: introduce alloc_usemap_and_memmap fix-2
> has been added to the -mm tree.  Its filename is
>      mm-sparse-introduce-alloc_usemap_and_memmap-fix-2.patch
>
> This patch should soon appear at
>     http://ozlabs.org/~akpm/mmots/broken-out/mm-sparse-introduce-alloc_usemap_and_memmap-fix-2.patch
> and later at
>     http://ozlabs.org/~akpm/mmotm/broken-out/mm-sparse-introduce-alloc_usemap_and_memmap-fix-2.patch
>
> Before you just go and hit "reply", please:
>    a) Consider who else should be cc'ed
>    b) Prefer to cc a suitable mailing list as well
>    c) Ideally: find the original patch on the mailing list and do a
>       reply-to-all to that, adding suitable additional cc's
>
> *** Remember to use Documentation/SubmitChecklist when testing your code ***
>
> The -mm tree is included into linux-next and is updated
> there every 3-4 working days
>
> ------------------------------------------------------
> From: Wanpeng Li <liwanp@linux.vnet.ibm.com>
> Subject: mm/sparse: introduce alloc_usemap_and_memmap fix-2
>
> Pass function pointer to alloc_usemap_and_memmap() instead of true/false.
>
> Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>
> Cc: Yinghai Lu <yinghai@kernel.org>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> ---
>
>  mm/sparse.c |   41 +++++++++++++++--------------------------
>  1 file changed, 15 insertions(+), 26 deletions(-)
>
> diff -puN mm/sparse.c~mm-sparse-introduce-alloc_usemap_and_memmap-fix-2 mm/sparse.c
> --- a/mm/sparse.c~mm-sparse-introduce-alloc_usemap_and_memmap-fix-2
> +++ a/mm/sparse.c
> @@ -339,13 +339,14 @@ static void __init check_usemap_section_
>  }
>  #endif /* CONFIG_MEMORY_HOTREMOVE */
>
> -static void __init sparse_early_usemaps_alloc_node(unsigned long**usemap_map,
> +static void __init sparse_early_usemaps_alloc_node(void **data,
>                                  unsigned long pnum_begin,
>                                  unsigned long pnum_end,
>                                  unsigned long usemap_count, int nodeid)
>  {
>         void *usemap;
>         unsigned long pnum;
> +       unsigned long **usemap_map = (unsigned long **)data;

Can you check if (void *data) will work?

void ** looks strange.

Yinghai

Re: + mm-sparse-introduce-alloc_usemap_and_memmap-fix-2.patch added to -mm tree

[Yinghai Lu]

On Thu, Aug 29, 2013 at 4:35 PM, Wanpeng Li <liwanp@linux.vnet.ibm.com> wrote:

> On Thu, Aug 29, 2013 at 01:44:18PM -0700, Yinghai Lu wrote:
>>>  mm/sparse.c |   41 +++++++++++++++--------------------------
>>>  1 file changed, 15 insertions(+), 26 deletions(-)
>>>
>>> diff -puN mm/sparse.c~mm-sparse-introduce-alloc_usemap_and_memmap-fix-2 mm/sparse.c
>>> --- a/mm/sparse.c~mm-sparse-introduce-alloc_usemap_and_memmap-fix-2
>>> +++ a/mm/sparse.c
>>> @@ -339,13 +339,14 @@ static void __init check_usemap_section_
>>>  }
>>>  #endif /* CONFIG_MEMORY_HOTREMOVE */
>>>
>>> -static void __init sparse_early_usemaps_alloc_node(unsigned long**usemap_map,
>>> +static void __init sparse_early_usemaps_alloc_node(void **data,
>>>                                  unsigned long pnum_begin,
>>>                                  unsigned long pnum_end,
>>>                                  unsigned long usemap_count, int nodeid)
>>>  {
>>>         void *usemap;
>>>         unsigned long pnum;
>>> +       unsigned long **usemap_map = (unsigned long **)data;
>>
>>Can you check if (void *data) will work?
>>
>>void ** looks strange.
>
> The original patch you give me has (void *data), however, there is compile warning.
>
> mm/sparse.c: In function  $B!F (Bsparse_init $B!G (B: mm/sparse.c:552:8: warning: passing argument 1 of  $B!F (Balloc_usemap_and_memmap $B!G (B
> from incompatible pointer type [enabled by default]
> mm/sparse.c:469:20: note: expected  $B!F (Bvoid (*)(void **, long unsigned int, long unsigned int,  long unsigned int,  int) $B!G (B
> but argument is of type  $B!F (Bvoid (*)(void *, long unsigned int,  long unsigned int,  long unsigned int,  int) $B!G (B
>
> The void ** fix it. ;-)

should change both to void *

Yinghai