From: Xiongwei Song Date: Fri, 14 Jan 2022 22:07:24 +0000 (-0800) Subject: mm: page_alloc: fix building error on -Werror=array-compare X-Git-Tag: accepted/tizen/unified/20230531.034423~35 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fa2c1f7935131363cfb14d3c009327128a17a53f;p=platform%2Fkernel%2Flinux-amlogic.git mm: page_alloc: fix building error on -Werror=array-compare commit ca831f29f8f25c97182e726429b38c0802200c8f upstream. 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 Reported-by: Arthur Marsh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Cc: Khem Raj Signed-off-by: Greg Kroah-Hartman [sw0312.kim: cherry-pick stable linux-4.9.y commit 27057333467c to resolve gcc-12 build issue] Signed-off-by: Seung-Woo Kim Change-Id: Ifd2e97713a205497b95d26ee20a248b63dd0104b --- diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 973e741720ce..46f19f811f77 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -6869,7 +6869,7 @@ void __init mem_init_print_info(const char *str) */ #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)