mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 22:21:40 +00:00
cris: 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 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: Mikael Starvik <starvik@axis.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
e275e0a687
commit
a4074d93dd
@ -19,36 +19,6 @@ unsigned long empty_zero_page;
|
||||
extern char _stext, _edata, _etext; /* From linkerscript */
|
||||
extern char __init_begin, __init_end;
|
||||
|
||||
void
|
||||
show_mem(void)
|
||||
{
|
||||
int i,free = 0,total = 0,cached = 0, reserved = 0, nonshared = 0;
|
||||
int shared = 0;
|
||||
|
||||
printk("\nMem-info:\n");
|
||||
show_free_areas();
|
||||
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 if (page_count(mem_map+i) == 1)
|
||||
nonshared++;
|
||||
else
|
||||
shared += page_count(mem_map+i) - 1;
|
||||
}
|
||||
printk("%d pages of RAM\n",total);
|
||||
printk("%d free pages\n",free);
|
||||
printk("%d reserved pages\n",reserved);
|
||||
printk("%d pages nonshared\n",nonshared);
|
||||
printk("%d pages shared\n",shared);
|
||||
printk("%d pages swap cached\n",cached);
|
||||
}
|
||||
|
||||
void __init
|
||||
mem_init(void)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user