Skip to contentSkip to conversation

mm-mm_initc-move-build-check-on-max_zonelists-out-of-ifdef.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Jun 29, 2024

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm/mm_init.c: move build check on MAX_ZONELISTS out of ifdef
has been removed from the -mm tree. Its filename was
mm-mm_initc-move-build-check-on-max_zonelists-out-of-ifdef.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Wei Yang <[email protected]>
Subject: mm/mm_init.c: move build check on MAX_ZONELISTS out of ifdef
Date: Wed, 19 Jun 2024 01:06:10 +0000

Current check on MAX_ZONELISTS is wrapped in CONFIG_DEBUG_MEMORY_INIT, which may not be triggered all the time.

Let's move it out to a more general place.

---

 mm/mm_init.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
mm/mm_init.c renamed from mm/mm_init.c~mm-mm_initc-move-build-check-on-max_zonelists-out-of-ifdef +1 -1
@@ -54,7 +54,6 @@ void __init mminit_verify_zonelist(void)
 		struct zonelist *zonelist;
 		int i, listid, zoneid;
 
-		BUILD_BUG_ON(MAX_ZONELISTS > 2);
 		for (i = 0; i < MAX_ZONELISTS * MAX_NR_ZONES; i++) {
 
 			/* Identify the zone and nodelist */
@@ -2657,6 +2656,7 @@ static void __init mem_init_print_info(v
 void __init mm_core_init(void)
 {
 	/* Initializations relying on SMP setup */
+	BUILD_BUG_ON(MAX_ZONELISTS > 2);
 	build_all_zonelists(NULL);
 	page_alloc_init_cpuhp();
 

_

Patches currently in -mm which might be from [email protected] are