Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bda2fa53 authored by Johannes Weiner's avatar Johannes Weiner Committed by Linus Torvalds
Browse files

powerpc: use generic show_mem() 



Remove arch-specific show_mem() in favor of the generic version.

This also removes the following redundant information display:

	- pages in swapcache, printed by show_swap_cache_info()

where show_mem() calls show_free_areas(), which calls
show_swap_cache_info().

Signed-off-by: default avatarJohannes Weiner <hannes@saeurebad.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c55281de

arch/powerpc/mm/mem.c

+0 −39
Original line number Diff line number Diff line
@@ -186,45 +186,6 @@ walk_memory_resource(unsigned long start_pfn, unsigned long nr_pages, void *arg, 
}

EXPORT_SYMBOL_GPL(walk_memory_resource);



void show_mem(void)

{

	unsigned long total = 0, reserved = 0;

	unsigned long shared = 0, cached = 0;

	unsigned long highmem = 0;

	struct page *page;

	pg_data_t *pgdat;

	unsigned long i;



	printk("Mem-info:\n");

	show_free_areas();

	for_each_online_pgdat(pgdat) {

		unsigned long flags;

		pgdat_resize_lock(pgdat, &flags);

		for (i = 0; i < pgdat->node_spanned_pages; i++) {

			if (!pfn_valid(pgdat->node_start_pfn + i))

				continue;

			page = pgdat_page_nr(pgdat, i);

			total++;

			if (PageHighMem(page))

				highmem++;

			if (PageReserved(page))

				reserved++;

			else if (PageSwapCache(page))

				cached++;

			else if (page_count(page))

				shared += page_count(page) - 1;

		}

		pgdat_resize_unlock(pgdat, &flags);

	}

	printk("%ld pages of RAM\n", total);

#ifdef CONFIG_HIGHMEM

	printk("%ld pages of HIGHMEM\n", highmem);

#endif

	printk("%ld reserved pages\n", reserved);

	printk("%ld pages shared\n", shared);

	printk("%ld pages swap cached\n", cached);

}



/*

 * Initialize the bootmem system and give it all the memory we

 * have available.  If we are using highmem, we only put the