linux-next: build failure after merge of the mm tree

Stephen Rothwell posted 1 patch 6 months ago
tools/include/linux/bitmap.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
linux-next: build failure after merge of the mm tree
Posted by Stephen Rothwell 6 months ago
Hi all,

After merging the mm tree, today's linux-next build (native powerpc perf)
failed like this:

In file included from arch/powerpc/util/../../../util/pmu.h:5,
                 from arch/powerpc/util/pmu.c:5:
tools/include/linux/bitmap.h: In function 'bitmap_alloc':
tools/include/linux/bitmap.h:83:69: error: unused parameter 'flags' [-Werror=unused-parameter]
   83 | static inline unsigned long *bitmap_alloc(unsigned int nbits, gfp_t flags)
      |                                                               ~~~~~~^~~~~
cc1: all warnings being treated as errors

Caused by commit

  351b9e493b09 ("lib/interval_tree: add test case for interval_tree_iter_xxx() helpers")

I have applied the following hack for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 12 Mar 2025 11:03:37 +1100
Subject: [PATCH] hack for "lib/interval_tree: add test case for
 interval_tree_iter_xxx() helpers"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 tools/include/linux/bitmap.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/include/linux/bitmap.h b/tools/include/linux/bitmap.h
index 8166719178f7..d4d300040d01 100644
--- a/tools/include/linux/bitmap.h
+++ b/tools/include/linux/bitmap.h
@@ -80,7 +80,7 @@ static inline void bitmap_or(unsigned long *dst, const unsigned long *src1,
 		__bitmap_or(dst, src1, src2, nbits);
 }
 
-static inline unsigned long *bitmap_alloc(unsigned int nbits, gfp_t flags)
+static inline unsigned long *bitmap_alloc(unsigned int nbits, gfp_t flags __maybe_unused)
 {
 	return malloc(bitmap_size(nbits));
 }
-- 
2.45.2

-- 
Cheers,
Stephen Rothwell
Re: linux-next: build failure after merge of the mm tree
Posted by Andrew Morton 6 months ago
On Wed, 12 Mar 2025 11:36:12 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> After merging the mm tree, today's linux-next build (native powerpc perf)
> failed like this:
> 
> In file included from arch/powerpc/util/../../../util/pmu.h:5,
>                  from arch/powerpc/util/pmu.c:5:
> tools/include/linux/bitmap.h: In function 'bitmap_alloc':
> tools/include/linux/bitmap.h:83:69: error: unused parameter 'flags' [-Werror=unused-parameter]
>    83 | static inline unsigned long *bitmap_alloc(unsigned int nbits, gfp_t flags)
>       |                                                               ~~~~~~^~~~~
> cc1: all warnings being treated as errors

Maybe we should turn off -Wno-unused-parameter for tools/.  The rest of
the kernel extensively expects that unused parameters to inlined
functions are acceptable, for stuff like this:

#else /* CONFIG_SWAP */
static inline struct swap_info_struct *swp_swap_info(swp_entry_t entry)
{
	return NULL;
}

static inline struct swap_info_struct *get_swap_device(swp_entry_t entry)
{
	return NULL;
}

static inline void put_swap_device(struct swap_info_struct *si)
{
}

so why do we make tools/ different?
Re: linux-next: build failure after merge of the mm tree
Posted by Wei Yang 6 months ago
On Wed, Mar 12, 2025 at 11:36:12AM +1100, Stephen Rothwell wrote:
>Hi all,
>
>After merging the mm tree, today's linux-next build (native powerpc perf)
>failed like this:
>
>In file included from arch/powerpc/util/../../../util/pmu.h:5,
>                 from arch/powerpc/util/pmu.c:5:
>tools/include/linux/bitmap.h: In function 'bitmap_alloc':
>tools/include/linux/bitmap.h:83:69: error: unused parameter 'flags' [-Werror=unused-parameter]
>   83 | static inline unsigned long *bitmap_alloc(unsigned int nbits, gfp_t flags)
>      |                                                               ~~~~~~^~~~~
>cc1: all warnings being treated as errors
>
>Caused by commit
>
>  351b9e493b09 ("lib/interval_tree: add test case for interval_tree_iter_xxx() helpers")
>
>I have applied the following hack for today.
>
>From: Stephen Rothwell <sfr@canb.auug.org.au>
>Date: Wed, 12 Mar 2025 11:03:37 +1100
>Subject: [PATCH] hack for "lib/interval_tree: add test case for
> interval_tree_iter_xxx() helpers"
>
>Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>---
> tools/include/linux/bitmap.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/tools/include/linux/bitmap.h b/tools/include/linux/bitmap.h
>index 8166719178f7..d4d300040d01 100644
>--- a/tools/include/linux/bitmap.h
>+++ b/tools/include/linux/bitmap.h
>@@ -80,7 +80,7 @@ static inline void bitmap_or(unsigned long *dst, const unsigned long *src1,
> 		__bitmap_or(dst, src1, src2, nbits);
> }
> 
>-static inline unsigned long *bitmap_alloc(unsigned int nbits, gfp_t flags)
>+static inline unsigned long *bitmap_alloc(unsigned int nbits, gfp_t flags __maybe_unused)
> {
> 	return malloc(bitmap_size(nbits));
> }

Hi, Stephen

Thanks for your fix. It looks good to me.

If it is ok to you, I would like to merge this into the original commit.

>-- 
>2.45.2
>
>-- 
>Cheers,
>Stephen Rothwell



-- 
Wei Yang
Help you, Help me
Re: linux-next: build failure after merge of the mm tree
Posted by Stephen Rothwell 6 months ago
Hi Wei,

On Wed, 12 Mar 2025 02:14:20 +0000 Wei Yang <richard.weiyang@gmail.com> wrote:
>
> Thanks for your fix. It looks good to me.
> 
> If it is ok to you, I would like to merge this into the original commit.

Fine by me.

-- 
Cheers,
Stephen Rothwell
Re: linux-next: build failure after merge of the mm tree
Posted by Wei Yang 6 months ago
On Wed, Mar 12, 2025 at 01:30:50PM +1100, Stephen Rothwell wrote:
>Hi Wei,
>
>On Wed, 12 Mar 2025 02:14:20 +0000 Wei Yang <richard.weiyang@gmail.com> wrote:
>>
>> Thanks for your fix. It looks good to me.
>> 
>> If it is ok to you, I would like to merge this into the original commit.
>
>Fine by me.
>

Thanks

Andrew

Would you mind merging it or prefer me to send a new version? 

>-- 
>Cheers,
>Stephen Rothwell



-- 
Wei Yang
Help you, Help me