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

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

m32r: use generic show_mem() 



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

This also removes the following redundant information display:

	- free swap pages, printed by show_swap_cache_info()
	- 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: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 969eefb5

arch/m32r/mm/init.c

+0 −36
Original line number Diff line number Diff line
@@ -36,42 +36,6 @@ pgd_t swapper_pg_dir[1024]; 


DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);



void show_mem(void)

{

	int total = 0, reserved = 0;

	int shared = 0, cached = 0;

	int highmem = 0;

	struct page *page;

	pg_data_t *pgdat;

	unsigned long i;



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

	show_free_areas();

	printk("Free swap:       %6ldkB\n",nr_swap_pages<<(PAGE_SHIFT-10));

	for_each_online_pgdat(pgdat) {

		unsigned long flags;

		pgdat_resize_lock(pgdat, &flags);

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

			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("%d pages of RAM\n", total);

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

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

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

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

}



/*

 * Cache of MMU context last used.

 */