OSDN Git Service

mm: page_alloc: fix building error on -Werror=array-compare
authorXiongwei Song <sxwjean@gmail.com>
Fri, 14 Jan 2022 22:07:24 +0000 (14:07 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 15 Jan 2022 14:30:29 +0000 (16:30 +0200)
Arthur Marsh reported we would hit the error below when building kernel
with gcc-12:

  CC      mm/page_alloc.o
  mm/page_alloc.c: In function `mem_init_print_info':
  mm/page_alloc.c:8173:27: error: comparison between two arrays [-Werror=array-compare]
   8173 |                 if (start <= pos && pos < end && size > adj) \
        |

In C++20, the comparision between arrays should be warned.

Link: https://lkml.kernel.org/r/20211125130928.32465-1-sxwjean@me.com
Signed-off-by: Xiongwei Song <sxwjean@gmail.com>
Reported-by: Arthur Marsh <arthur.marsh@internode.on.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
mm/page_alloc.c

index 806f317..c4ef450 100644 (file)
@@ -8228,7 +8228,7 @@ void __init mem_init_print_info(void)
         */
 #define adj_init_size(start, end, size, pos, adj) \
        do { \
-               if (start <= pos && pos < end && size > adj) \
+               if (&start[0] <= &pos[0] && &pos[0] < &end[0] && size > adj) \
                        size -= adj; \
        } while (0)