Skip to content

Commit

Permalink
lib/show_mem.c: use for_each_populated_zone() simplify code
Browse files Browse the repository at this point in the history
__show_mem() needs to iterate over all zones that have memory, we can
simplify the code by using for_each_populated_zone().

Link: https://lkml.kernel.org/r/20230417035226.4013584-1-yajun.deng@linux.dev
Signed-off-by: Yajun Deng <yajun.deng@linux.dev>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
  • Loading branch information
Yajun Deng authored and akpm00 committed Apr 21, 2023
1 parent 4bf4f15 commit 13215e8
Showing 1 changed file with 6 additions and 13 deletions.
19 changes: 6 additions & 13 deletions lib/show_mem.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

total += zone->present_pages;
reserved += zone->present_pages - zone_managed_pages(zone);

if (is_highmem_idx(zoneid))
highmem += zone->present_pages;
}
if (is_highmem(zone))
highmem += zone->present_pages;
}

printk("%lu pages RAM\n", total);
Expand Down

0 comments on commit 13215e8

Please sign in to comment.