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

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

um: 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>
Acked-by: default avatarJeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8dad322f

arch/um/kernel/mem.c

+0 −31
Original line number Diff line number Diff line
@@ -264,37 +264,6 @@ void free_initrd_mem(unsigned long start, unsigned long end) 
}

#endif



void show_mem(void)

{

	int pfn, total = 0, reserved = 0;

	int shared = 0, cached = 0;

	int high_mem = 0;

	struct page *page;



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

	show_free_areas();

	printk(KERN_INFO "Free swap:       %6ldkB\n",

	       nr_swap_pages<<(PAGE_SHIFT-10));

	pfn = max_mapnr;

	while (pfn-- > 0) {

		page = pfn_to_page(pfn);

		total++;

		if (PageHighMem(page))

			high_mem++;

		if (PageReserved(page))

			reserved++;

		else if (PageSwapCache(page))

			cached++;

		else if (page_count(page))

			shared += page_count(page) - 1;

	}

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

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

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

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

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

}



/* Allocate and free page tables. */



pgd_t *pgd_alloc(struct mm_struct *mm)