2015-12-08 14:03:43

by Johannes Weiner

Subject: [PATCH] mm: page_alloc: fix variable type in zonelist type iteration

/home/hannes/src/linux/linux/mm/page_alloc.c: In function ‘build_zonelists’:
/home/hannes/src/linux/linux/mm/page_alloc.c:4171:16: warning: comparison between ‘enum zone_type’ and ‘enum <anonymous>’ [-Wenum-compare]
for (i = 0; i < MAX_ZONELISTS; i++) {
^

MAX_ZONELISTS has never been of enum zone_type, probably gcc only
recently started including -Wenum-compare in -Wall.

Make i a simple int.

Signed-off-by: Johannes Weiner <[email protected]>
---
mm/page_alloc.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index d06a7d0..d5f291b 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -4160,8 +4160,7 @@ static void set_zonelist_order(void)

static void build_zonelists(pg_data_t *pgdat)
{
- int j, node, load;
- enum zone_type i;
+ int i, j, node, load;
nodemask_t used_mask;
int local_node, prev_node;
struct zonelist *zonelist;
--
2.6.3

2015-12-08 21:56:45

by David Rientjes

Subject: Re: [PATCH] mm: page_alloc: fix variable type in zonelist type iteration

On Tue, 8 Dec 2015, Johannes Weiner wrote:

> /home/hannes/src/linux/linux/mm/page_alloc.c: In function ‘build_zonelists’:
> /home/hannes/src/linux/linux/mm/page_alloc.c:4171:16: warning: comparison between ‘enum zone_type’ and ‘enum <anonymous>’ [-Wenum-compare]
> for (i = 0; i < MAX_ZONELISTS; i++) {
> ^
>
> MAX_ZONELISTS has never been of enum zone_type, probably gcc only
> recently started including -Wenum-compare in -Wall.
>
> Make i a simple int.
>
> Signed-off-by: Johannes Weiner <[email protected]>

I think this is already handled by
http://marc.info/?l=linux-kernel&m=144901185732632.

2015-12-09 14:42:00

by Johannes Weiner

Subject: Re: [PATCH] mm: page_alloc: fix variable type in zonelist type iteration

On Tue, Dec 08, 2015 at 01:56:42PM -0800, David Rientjes wrote:
> On Tue, 8 Dec 2015, Johannes Weiner wrote:
>
> > /home/hannes/src/linux/linux/mm/page_alloc.c: In function ‘build_zonelists’:
> > /home/hannes/src/linux/linux/mm/page_alloc.c:4171:16: warning: comparison between ‘enum zone_type’ and ‘enum <anonymous>’ [-Wenum-compare]
> > for (i = 0; i < MAX_ZONELISTS; i++) {
> > ^
> >
> > MAX_ZONELISTS has never been of enum zone_type, probably gcc only
> > recently started including -Wenum-compare in -Wall.
> >
> > Make i a simple int.
> >
> > Signed-off-by: Johannes Weiner <[email protected]>
>
> I think this is already handled by
> http://marc.info/?l=linux-kernel&m=144901185732632.

Yup, it does. Thanks, David. Scratch this patch.