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

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

mips: 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().

And show_mem() does now actually print something on configurations
with multiple nodes.

Signed-off-by: default avatarJohannes Weiner <hannes@saeurebad.de>
Acked-by: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4bad9ea2

arch/mips/mm/Makefile

+1 −2
Original line number Original line Diff line number Diff line
@@ -3,8 +3,7 @@ 
#

#





obj-y				+= cache.o dma-default.o extable.o fault.o \

obj-y				+= cache.o dma-default.o extable.o fault.o \

				   init.o pgtable.o tlbex.o tlbex-fault.o \

				   init.o tlbex.o tlbex-fault.o uasm.o page.o

				   uasm.o page.o





obj-$(CONFIG_32BIT)		+= ioremap.o pgtable-32.o

obj-$(CONFIG_32BIT)		+= ioremap.o pgtable-32.o

obj-$(CONFIG_64BIT)		+= pgtable-64.o

obj-$(CONFIG_64BIT)		+= pgtable-64.o

arch/mips/mm/pgtable.c

deleted100644 → 0
+0 −36
Original line number Original line Diff line number Diff line 
#include <linux/kernel.h>

#include <linux/mm.h>

#include <linux/swap.h>



void show_mem(void)

{

#ifndef CONFIG_NEED_MULTIPLE_NODES  /* XXX(hch): later.. */

	int pfn, total = 0, reserved = 0;

	int shared = 0, cached = 0;

	int highmem = 0;

	struct page *page;



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

	show_free_areas();

	pfn = max_mapnr;

	while (pfn-- > 0) {

		if (!pfn_valid(pfn))

			continue;

		page = pfn_to_page(pfn);

		total++;

		if (PageHighMem(page))

			highmem++;

		if (PageReserved(page))

			reserved++;

		else if (PageSwapCache(page))

			cached++;

		else if (page_count(page))

			shared += page_count(page) - 1;

	}

	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);

#endif

}