Skip to content

Commit

Permalink
m68k: use generic show_mem()
Browse files Browse the repository at this point in the history
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 swapcache, printed by show_swap_cache_info()

where show_mem() calls show_free_areas(), which calls
show_swap_cache_info().

Signed-off-by: Johannes Weiner <hannes@saeurebad.de>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Johannes Weiner authored and Linus Torvalds committed Jul 26, 2008
1 parent 0ec5e0e commit 969eefb
Showing 1 changed file with 0 additions and 30 deletions.
30 changes: 0 additions & 30 deletions arch/m68k/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -69,36 +69,6 @@ void __init m68k_setup_node(int node)
void *empty_zero_page;
EXPORT_SYMBOL(empty_zero_page);

void show_mem(void)
{
pg_data_t *pgdat;
int free = 0, total = 0, reserved = 0, shared = 0;
int cached = 0;
int i;

printk("\nMem-info:\n");
show_free_areas();
for_each_online_pgdat(pgdat) {
for (i = 0; i < pgdat->node_spanned_pages; i++) {
struct page *page = pgdat->node_mem_map + i;
total++;
if (PageReserved(page))
reserved++;
else if (PageSwapCache(page))
cached++;
else if (!page_count(page))
free++;
else
shared += page_count(page) - 1;
}
}
printk("%d pages of RAM\n",total);
printk("%d free pages\n",free);
printk("%d reserved pages\n",reserved);
printk("%d pages shared\n",shared);
printk("%d pages swap cached\n",cached);
}

extern void init_pointer_table(unsigned long ptable);

/* References to section boundaries */
Expand Down

0 comments on commit 969eefb

Please sign in to comment.