mirror of
https://github.com/Telecominfraproject/wlan-ap.git
synced 2025-10-30 18:07:52 +00:00
34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
From: Xiongwei Song <sxwjean@gmail.com>
|
|
Date: Fri, 14 Jan 2022 14:07:24 -0800
|
|
Subject: [PATCH] mm: page_alloc: fix building error on -Werror=array-compare
|
|
|
|
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>
|
|
---
|
|
|
|
--- a/mm/page_alloc.c
|
|
+++ b/mm/page_alloc.c
|
|
@@ -7579,7 +7579,7 @@ void __init mem_init_print_info(const ch
|
|
*/
|
|
#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)
|
|
|