diff options
| author | Johannes Weiner <hannes@saeurebad.de> | 2008-07-25 22:46:10 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-26 15:00:10 -0400 |
| commit | a2e9c44337b53aef37f3382920a478cac3777ba9 (patch) | |
| tree | dde09aa974ade139b1fb316919a4d01559d68d5a | |
| parent | 46244a2b3c1dfd83041bcf0428c584d3a66b30cc (diff) | |
blackfin: 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: Bryan Wu <cooloney@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | arch/blackfin/mm/init.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/arch/blackfin/mm/init.c b/arch/blackfin/mm/init.c index ec3141fefd20..4d5326ee9a85 100644 --- a/arch/blackfin/mm/init.c +++ b/arch/blackfin/mm/init.c | |||
| @@ -53,33 +53,6 @@ static unsigned long empty_bad_page; | |||
| 53 | 53 | ||
| 54 | unsigned long empty_zero_page; | 54 | unsigned long empty_zero_page; |
| 55 | 55 | ||
| 56 | void show_mem(void) | ||
| 57 | { | ||
| 58 | unsigned long i; | ||
| 59 | int free = 0, total = 0, reserved = 0, shared = 0; | ||
| 60 | |||
| 61 | int cached = 0; | ||
| 62 | printk(KERN_INFO "Mem-info:\n"); | ||
| 63 | show_free_areas(); | ||
| 64 | i = max_mapnr; | ||
| 65 | while (i-- > 0) { | ||
| 66 | total++; | ||
| 67 | if (PageReserved(mem_map + i)) | ||
| 68 | reserved++; | ||
| 69 | else if (PageSwapCache(mem_map + i)) | ||
| 70 | cached++; | ||
| 71 | else if (!page_count(mem_map + i)) | ||
| 72 | free++; | ||
| 73 | else | ||
| 74 | shared += page_count(mem_map + i) - 1; | ||
| 75 | } | ||
| 76 | printk(KERN_INFO "%d pages of RAM\n", total); | ||
| 77 | printk(KERN_INFO "%d free pages\n", free); | ||
| 78 | printk(KERN_INFO "%d reserved pages\n", reserved); | ||
| 79 | printk(KERN_INFO "%d pages shared\n", shared); | ||
| 80 | printk(KERN_INFO "%d pages swap cached\n", cached); | ||
| 81 | } | ||
| 82 | |||
| 83 | /* | 56 | /* |
| 84 | * paging_init() continues the virtual memory environment setup which | 57 | * paging_init() continues the virtual memory environment setup which |
| 85 | * was begun by the code in arch/head.S. | 58 | * was begun by the code in arch/head.S. |
