Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux...

[linux-2.6-omap-h63xx.git] / arch / frv / mm / init.c

diff --git a/arch/frv/mm/init.c b/arch/frv/mm/init.c
index 9af7740f32fb348a1cecf13a8e5292627e53ecf0..0708284f85fb3d690d4e649366ea056282a171b8 100644 (file)
--- a/arch/frv/mm/init.c
+++ b/arch/frv/mm/init.c
@@ -61,37 +61,6 @@ static unsigned long empty_bad_page;
 unsigned long empty_zero_page;
 EXPORT_SYMBOL(empty_zero_page);
 
-/*****************************************************************************/
-/*
- *
- */
-void show_mem(void)
-{
-       unsigned long i;
-       int free = 0, total = 0, reserved = 0, shared = 0;
-
-       printk("\nMem-info:\n");
-       show_free_areas();
-       i = max_mapnr;
-       while (i-- > 0) {
-               struct page *page = &mem_map[i];
-
-               total++;
-               if (PageReserved(page))
-                       reserved++;
-               else if (!page_count(page))
-                       free++;
-               else
-                       shared += page_count(page) - 1;
-       }
-
-       printk("%d pages of RAM\n",total);
-       printk("%d free pages\n",free);
-       printk("%d reserved pages\n",reserved);
-       printk("%d pages shared\n",shared);
-
-} /* end show_mem() */
-
 /*****************************************************************************/
 /*
  * paging_init() continues the virtual memory environment setup which
@@ -118,8 +87,6 @@ void __init paging_init(void)
 
                pkmap_page_table = alloc_bootmem_pages(PAGE_SIZE);
 
-               memset(pkmap_page_table, 0, PAGE_SIZE);
-
                pge = swapper_pg_dir + pgd_index_k(PKMAP_BASE);
                pue = pud_offset(pge, PKMAP_BASE);
                pme = pmd_offset(pue, PKMAP_BASE);