Merge branch 'linus' into cpus4096

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)