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

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

sh: use generic show_mem() 



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

This also removes the following redundant information display:

	- free pages, printed by show_free_areas()
	- pages in slab, printed by show_free_areas()
	- 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>
Acked-by: default avatarPaul Mundt <lethal@linux-sh.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 471a5423

arch/sh/mm/init.c

+0 −41
Original line number Original line Diff line number Diff line
@@ -25,47 +25,6 @@ DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); 
pgd_t swapper_pg_dir[PTRS_PER_PGD];

pgd_t swapper_pg_dir[PTRS_PER_PGD];

unsigned long cached_to_uncached = 0;

unsigned long cached_to_uncached = 0;





void show_mem(void)

{

	int total = 0, reserved = 0, free = 0;

	int shared = 0, cached = 0, slab = 0;

	pg_data_t *pgdat;



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

	show_free_areas();



	for_each_online_pgdat(pgdat) {

		unsigned long flags, i;



		pgdat_resize_lock(pgdat, &flags);

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

			struct page *page = pgdat_page_nr(pgdat, i);

			total++;

			if (PageReserved(page))

				reserved++;

			else if (PageSwapCache(page))

				cached++;

			else if (PageSlab(page))

				slab++;

			else if (!page_count(page))

				free++;

			else

				shared += page_count(page) - 1;

		}

		pgdat_resize_unlock(pgdat, &flags);

	}



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

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

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

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

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

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

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

	printk(KERN_INFO "Total of %ld pages in page table cache\n",

	       quicklist_total_size());

}



#ifdef CONFIG_MMU

#ifdef CONFIG_MMU

static void set_pte_phys(unsigned long addr, unsigned long phys, pgprot_t prot)

static void set_pte_phys(unsigned long addr, unsigned long phys, pgprot_t prot)

{

{