diff options
author | Johannes Weiner <hannes@saeurebad.de> | 2008-07-25 22:46:20 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-26 15:00:11 -0400 |
commit | a4074d93dd4e8f46f727840baa2be02d544fd17f (patch) | |
tree | f23d3503d63757d8bfd3b930bf83b59f92da29ea /arch/cris/mm | |
parent | e275e0a687e83add62b10e6d36b67f0964455469 (diff) |
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>
Diffstat (limited to 'arch/cris/mm')
-rw-r--r-- | arch/cris/mm/init.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/arch/cris/mm/init.c b/arch/cris/mm/init.c index 5b06ffa15e34..2fdd212eb250 100644 --- a/arch/cris/mm/init.c +++ b/arch/cris/mm/init.c | |||
@@ -19,36 +19,6 @@ unsigned long empty_zero_page; | |||
19 | extern char _stext, _edata, _etext; /* From linkerscript */ | 19 | extern char _stext, _edata, _etext; /* From linkerscript */ |
20 | extern char __init_begin, __init_end; | 20 | extern char __init_begin, __init_end; |
21 | 21 | ||
22 | void | ||
23 | show_mem(void) | ||
24 | { | ||
25 | int i,free = 0,total = 0,cached = 0, reserved = 0, nonshared = 0; | ||
26 | int shared = 0; | ||
27 | |||
28 | printk("\nMem-info:\n"); | ||
29 | show_free_areas(); | ||
30 | i = max_mapnr; | ||
31 | while (i-- > 0) { | ||
32 | total++; | ||
33 | if (PageReserved(mem_map+i)) | ||
34 | reserved++; | ||
35 | else if (PageSwapCache(mem_map+i)) | ||
36 | cached++; | ||
37 | else if (!page_count(mem_map+i)) | ||
38 | free++; | ||
39 | else if (page_count(mem_map+i) == 1) | ||
40 | nonshared++; | ||
41 | else | ||
42 | shared += page_count(mem_map+i) - 1; | ||
43 | } | ||
44 | printk("%d pages of RAM\n",total); | ||
45 | printk("%d free pages\n",free); | ||
46 | printk("%d reserved pages\n",reserved); | ||
47 | printk("%d pages nonshared\n",nonshared); | ||
48 | printk("%d pages shared\n",shared); | ||
49 | printk("%d pages swap cached\n",cached); | ||
50 | } | ||
51 | |||
52 | void __init | 22 | void __init |
53 | mem_init(void) | 23 | mem_init(void) |
54 | { | 24 | { |