1 files changed, 9 insertions, 30 deletions

diff --git a/arch/blackfin/mm/init.c b/arch/blackfin/mm/init.c
index ec3141fefd20..bc240abb8745 100644
--- a/arch/blackfin/mm/init.c
+++ b/arch/blackfin/mm/init.c
@@ -53,33 +53,6 @@ static unsigned long empty_bad_page;
 
 unsigned long empty_zero_page;
 
-void show_mem(void)
-{
-        unsigned long i;
-        int free = 0, total = 0, reserved = 0, shared = 0;
-
-        int cached = 0;
-        printk(KERN_INFO "Mem-info:\n");
-        show_free_areas();
-        i = max_mapnr;
-        while (i-- > 0) {
-                total++;
-                if (PageReserved(mem_map + i))
-                        reserved++;
-                else if (PageSwapCache(mem_map + i))
-                        cached++;
-                else if (!page_count(mem_map + i))
-                        free++;
-                else
-                        shared += page_count(mem_map + i) - 1;
-        }
-        printk(KERN_INFO "%d pages of RAM\n", total);
-        printk(KERN_INFO "%d free pages\n", free);
-        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);
-}
-
 /*
  * paging_init() continues the virtual memory environment setup which
  * was begun by the code in arch/head.S.
@@ -164,11 +137,14 @@ void __init mem_init(void)
                 "(%uk init code, %uk kernel code, %uk data, %uk dma, %uk reserved)\n",
                 (unsigned long) freepages << (PAGE_SHIFT-10), _ramend >> 10,
                 initk, codek, datak, DMA_UNCACHED_REGION >> 10, (reservedpages << (PAGE_SHIFT-10)));
+}
+
+static int __init sram_init(void)
+{
+        unsigned long tmp;
 
         /* Initialize the blackfin L1 Memory. */
-        l1sram_init();
-        l1_data_sram_init();
-        l1_inst_sram_init();
+        bfin_sram_init();
 
         /* Allocate this once; never free it.  We assume this gives us a
            pointer to the start of L1 scratchpad memory; panic if it
@@ -179,7 +155,10 @@ void __init mem_init(void)
                         tmp, (unsigned long)L1_SCRATCH_TASK_INFO);
                 panic("No L1, time to give up\n");
         }
+
+        return 0;
 }
+pure_initcall(sram_init);
 
 static void __init free_init_pages(const char *what, unsigned long begin, unsigned long end)
 {