[5.10,12/25] radix tree test suite: Fix compilation
diff mbox series

Message ID 20210415144413.551014173@linuxfoundation.org
State New
Headers show
Series
  • Untitled series #495371
Related show

Commit Message

Greg Kroah-Hartman April 15, 2021, 2:48 p.m. UTC
From: Matthew Wilcox (Oracle) <willy@infradead.org>

[ Upstream commit 7487de534dcbe143e6f41da751dd3ffcf93b00ee ]

Commit 4bba4c4bb09a added tools/include/linux/compiler_types.h which
includes linux/compiler-gcc.h.  Unfortunately, we had our own (empty)
compiler_types.h which overrode the one added by that commit, and
so we lost the definition of __must_be_array().  Removing our empty
compiler_types.h fixes the problem and reduces our divergence from the
rest of the tools.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 tools/testing/radix-tree/linux/compiler_types.h | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 tools/testing/radix-tree/linux/compiler_types.h

Comments

Matthew Wilcox April 15, 2021, 3:12 p.m. UTC | #1
On Thu, Apr 15, 2021 at 04:48:06PM +0200, Greg Kroah-Hartman wrote:
> From: Matthew Wilcox (Oracle) <willy@infradead.org>
> 
> [ Upstream commit 7487de534dcbe143e6f41da751dd3ffcf93b00ee ]
> 
> Commit 4bba4c4bb09a added tools/include/linux/compiler_types.h which
> includes linux/compiler-gcc.h.  Unfortunately, we had our own (empty)
> compiler_types.h which overrode the one added by that commit, and
> so we lost the definition of __must_be_array().  Removing our empty
> compiler_types.h fixes the problem and reduces our divergence from the
> rest of the tools.

I don't see 4bba4c4bb09a backported to 5.10.y, so I think this will break
compilation of the radix tree test suite.  The corresponding commit for
5.11.y is good, since 5.11.y includes 4bba4c4bb09a.
Sasha Levin April 16, 2021, 12:06 a.m. UTC | #2
On Thu, Apr 15, 2021 at 04:12:36PM +0100, Matthew Wilcox wrote:
>On Thu, Apr 15, 2021 at 04:48:06PM +0200, Greg Kroah-Hartman wrote:
>> From: Matthew Wilcox (Oracle) <willy@infradead.org>
>>
>> [ Upstream commit 7487de534dcbe143e6f41da751dd3ffcf93b00ee ]
>>
>> Commit 4bba4c4bb09a added tools/include/linux/compiler_types.h which
>> includes linux/compiler-gcc.h.  Unfortunately, we had our own (empty)
>> compiler_types.h which overrode the one added by that commit, and
>> so we lost the definition of __must_be_array().  Removing our empty
>> compiler_types.h fixes the problem and reduces our divergence from the
>> rest of the tools.
>
>I don't see 4bba4c4bb09a backported to 5.10.y, so I think this will break
>compilation of the radix tree test suite.  The corresponding commit for
>5.11.y is good, since 5.11.y includes 4bba4c4bb09a.

I'll drop it from 5.10, thanks!

Patch
diff mbox series

diff --git a/tools/testing/radix-tree/linux/compiler_types.h b/tools/testing/radix-tree/linux/compiler_types.h
deleted file mode 100644
index e69de29bb2d1..000000000000