diff options
author | Johannes Weiner <hannes@saeurebad.de> | 2008-07-25 22:46:14 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-26 15:00:11 -0400 |
commit | bda2fa535564ace56a395d5b65c6dc81305401fa (patch) | |
tree | 4013ab798e0c42b93d7cf8f2cd16c6c6003c79c4 | |
parent | c55281dee09a843dd6bf5070324b86b84847e6ea (diff) |
powerpc: use generic show_mem()
Remove arch-specific show_mem() in favor of the generic version.
This also removes the following redundant information display:
- 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>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/powerpc/mm/mem.c | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index 1ca2235f0965..702691cb9e82 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c | |||
@@ -186,45 +186,6 @@ walk_memory_resource(unsigned long start_pfn, unsigned long nr_pages, void *arg, | |||
186 | } | 186 | } |
187 | EXPORT_SYMBOL_GPL(walk_memory_resource); | 187 | EXPORT_SYMBOL_GPL(walk_memory_resource); |
188 | 188 | ||
189 | void show_mem(void) | ||
190 | { | ||
191 | unsigned long total = 0, reserved = 0; | ||
192 | unsigned long shared = 0, cached = 0; | ||
193 | unsigned long highmem = 0; | ||
194 | struct page *page; | ||
195 | pg_data_t *pgdat; | ||
196 | unsigned long i; | ||
197 | |||
198 | printk("Mem-info:\n"); | ||
199 | show_free_areas(); | ||
200 | for_each_online_pgdat(pgdat) { | ||
201 | unsigned long flags; | ||
202 | pgdat_resize_lock(pgdat, &flags); | ||
203 | for (i = 0; i < pgdat->node_spanned_pages; i++) { | ||
204 | if (!pfn_valid(pgdat->node_start_pfn + i)) | ||
205 | continue; | ||
206 | page = pgdat_page_nr(pgdat, i); | ||
207 | total++; | ||
208 | if (PageHighMem(page)) | ||
209 | highmem++; | ||
210 | if (PageReserved(page)) | ||
211 | reserved++; | ||
212 | else if (PageSwapCache(page)) | ||
213 | cached++; | ||
214 | else if (page_count(page)) | ||
215 | shared += page_count(page) - 1; | ||
216 | } | ||
217 | pgdat_resize_unlock(pgdat, &flags); | ||
218 | } | ||
219 | printk("%ld pages of RAM\n", total); | ||
220 | #ifdef CONFIG_HIGHMEM | ||
221 | printk("%ld pages of HIGHMEM\n", highmem); | ||
222 | #endif | ||
223 | printk("%ld reserved pages\n", reserved); | ||
224 | printk("%ld pages shared\n", shared); | ||
225 | printk("%ld pages swap cached\n", cached); | ||
226 | } | ||
227 | |||
228 | /* | 189 | /* |
229 | * Initialize the bootmem system and give it all the memory we | 190 | * Initialize the bootmem system and give it all the memory we |
230 | * have available. If we are using highmem, we only put the | 191 | * have available. If we are using highmem, we only put the |