Skip to contentSkip to conversation

lib-show_memc-use-for_each_populated_zone-simplify-code.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Apr 21, 2023

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: lib/show_mem.c: use for_each_populated_zone() simplify code
has been removed from the -mm tree. Its filename was
lib-show_memc-use-for_each_populated_zone-simplify-code.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: Yajun Deng <[email protected]>
Subject: lib/show_mem.c: use for_each_populated_zone() simplify code
Date: Mon, 17 Apr 2023 11:52:26 +0800

__show_mem() needs to iterate over all zones that have memory, we can simplify the code by using for_each_populated_zone().

---

 lib/show_mem.c |   21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)
lib/show_mem.c renamed from lib/show_mem.c~lib-show_memc-use-for_each_populated_zone-simplify-code +7 -14
@@ -10,26 +10,19 @@
 
 void __show_mem(unsigned int filter, nodemask_t *nodemask, int max_zone_idx)
 {
-	pg_data_t *pgdat;
 	unsigned long total = 0, reserved = 0, highmem = 0;
+	struct zone *zone;
 
 	printk("Mem-Info:\n");
 	__show_free_areas(filter, nodemask, max_zone_idx);
 
-	for_each_online_pgdat(pgdat) {
-		int zoneid;
+	for_each_populated_zone(zone) {
 
-		for (zoneid = 0; zoneid < MAX_NR_ZONES; zoneid++) {
-			struct zone *zone = &pgdat->node_zones[zoneid];
-			if (!populated_zone(zone))
-				continue;
-
-			total += zone->present_pages;
-			reserved += zone->present_pages - zone_managed_pages(zone);
-
-			if (is_highmem_idx(zoneid))
-				highmem += zone->present_pages;
-		}
+		total += zone->present_pages;
+		reserved += zone->present_pages - zone_managed_pages(zone);
+
+		if (is_highmem(zone))
+			highmem += zone->present_pages;
 	}
 
 	printk("%lu pages RAM\n", total);

_

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