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

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

alpha: 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()
	- 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: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 454c63b0

arch/alpha/mm/init.c

+0 −30
Original line number Diff line number Diff line
@@ -94,36 +94,6 @@ __bad_page(void) 
	return pte_mkdirty(mk_pte(virt_to_page(EMPTY_PGE), PAGE_SHARED));

}



#ifndef CONFIG_DISCONTIGMEM

void

show_mem(void)

{

	long i,free = 0,total = 0,reserved = 0;

	long shared = 0, cached = 0;



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

	show_free_areas();

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

	i = max_mapnr;

	while (i-- > 0) {

		total++;

		if (PageReserved(mem_map+i))

			reserved++;

		else if (PageSwapCache(mem_map+i))

			cached++;

		else if (!page_count(mem_map+i))

			free++;

		else

			shared += page_count(mem_map + i) - 1;

	}

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

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

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

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

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

}

#endif



static inline unsigned long

load_PCB(struct pcb_struct *pcb)

{

arch/alpha/mm/numa.c

+0 −35
Original line number Diff line number Diff line
@@ -359,38 +359,3 @@ void __init mem_init(void) 
	mem_stress();

#endif

}
 


void

show_mem(void)

{

	long i,free = 0,total = 0,reserved = 0;

	long shared = 0, cached = 0;

	int nid;



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

	show_free_areas();

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

	for_each_online_node(nid) {

		unsigned long flags;

		pgdat_resize_lock(NODE_DATA(nid), &flags);

		i = node_spanned_pages(nid);

		while (i-- > 0) {

			struct page *page = nid_page_nr(nid, i);

			total++;

			if (PageReserved(page))

				reserved++;

			else if (PageSwapCache(page))

				cached++;

			else if (!page_count(page))

				free++;

			else

				shared += page_count(page) - 1;

		}

		pgdat_resize_unlock(NODE_DATA(nid), &flags);

	}

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

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

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

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

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

}