diff options
| author | Johannes Weiner <hannes@saeurebad.de> | 2008-07-25 19:46:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-26 12:00:10 -0700 |
| commit | 79b0cbd113a9de1eaa3322528ccaeb97bd9189cc (patch) | |
| tree | 650bfdad8ca79b1c55053aff7b321b582067bd85 /arch/um | |
| parent | 8dad322f5449010c14990dd6934878f576b2ee60 (diff) | |
| download | linux-79b0cbd113a9de1eaa3322528ccaeb97bd9189cc.tar.gz linux-79b0cbd113a9de1eaa3322528ccaeb97bd9189cc.tar.bz2 linux-79b0cbd113a9de1eaa3322528ccaeb97bd9189cc.zip | |
um: use generic show_mem()
Remove arch-specific show_mem() in favor of the generic version.
This also removes the following redundant information display:
- free swap pages, printed by show_swap_cache_info()
- 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: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/kernel/mem.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c index e2274ef3155d..61d7e6138ff5 100644 --- a/arch/um/kernel/mem.c +++ b/arch/um/kernel/mem.c @@ -264,37 +264,6 @@ void free_initrd_mem(unsigned long start, unsigned long end) } #endif -void show_mem(void) -{ - int pfn, total = 0, reserved = 0; - int shared = 0, cached = 0; - int high_mem = 0; - struct page *page; - - printk(KERN_INFO "Mem-info:\n"); - show_free_areas(); - printk(KERN_INFO "Free swap: %6ldkB\n", - nr_swap_pages<<(PAGE_SHIFT-10)); - pfn = max_mapnr; - while (pfn-- > 0) { - page = pfn_to_page(pfn); - total++; - if (PageHighMem(page)) - high_mem++; - if (PageReserved(page)) - reserved++; - else if (PageSwapCache(page)) - cached++; - else if (page_count(page)) - shared += page_count(page) - 1; - } - printk(KERN_INFO "%d pages of RAM\n", total); - printk(KERN_INFO "%d pages of HIGHMEM\n", high_mem); - printk(KERN_INFO "%d reserved pages\n", reserved); - printk(KERN_INFO "%d pages shared\n", shared); - printk(KERN_INFO "%d pages swap cached\n", cached); -} - /* Allocate and free page tables. */ pgd_t *pgd_alloc(struct mm_struct *mm) |