diff options
author | Johannes Weiner <hannes@saeurebad.de> | 2008-07-25 22:46:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-26 15:00:11 -0400 |
commit | 0ec5e0edd155385cb59cb9857de3176524ba4ff8 (patch) | |
tree | 3b9078955ca172def6b908b3b8c8e39a629f19f6 /arch/m68knommu | |
parent | e66ddf1a4593d9bec8623782b94d7b50cc58cec5 (diff) |
m68knommu: 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: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/m68knommu')
-rw-r--r-- | arch/m68knommu/mm/init.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/arch/m68knommu/mm/init.c b/arch/m68knommu/mm/init.c index 22e2a0d02b81..3bf249c53e41 100644 --- a/arch/m68knommu/mm/init.c +++ b/arch/m68knommu/mm/init.c | |||
@@ -62,33 +62,6 @@ static unsigned long empty_bad_page; | |||
62 | 62 | ||
63 | unsigned long empty_zero_page; | 63 | unsigned long empty_zero_page; |
64 | 64 | ||
65 | void show_mem(void) | ||
66 | { | ||
67 | unsigned long i; | ||
68 | int free = 0, total = 0, reserved = 0, shared = 0; | ||
69 | int cached = 0; | ||
70 | |||
71 | printk(KERN_INFO "\nMem-info:\n"); | ||
72 | show_free_areas(); | ||
73 | i = max_mapnr; | ||
74 | while (i-- > 0) { | ||
75 | total++; | ||
76 | if (PageReserved(mem_map+i)) | ||
77 | reserved++; | ||
78 | else if (PageSwapCache(mem_map+i)) | ||
79 | cached++; | ||
80 | else if (!page_count(mem_map+i)) | ||
81 | free++; | ||
82 | else | ||
83 | shared += page_count(mem_map+i) - 1; | ||
84 | } | ||
85 | printk(KERN_INFO "%d pages of RAM\n",total); | ||
86 | printk(KERN_INFO "%d free pages\n",free); | ||
87 | printk(KERN_INFO "%d reserved pages\n",reserved); | ||
88 | printk(KERN_INFO "%d pages shared\n",shared); | ||
89 | printk(KERN_INFO "%d pages swap cached\n",cached); | ||
90 | } | ||
91 | |||
92 | extern unsigned long memory_start; | 65 | extern unsigned long memory_start; |
93 | extern unsigned long memory_end; | 66 | extern unsigned long memory_end; |
94 | 67 | ||