Merge branch 'fixes' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6

[powerpc.git] / arch / blackfin / mm / init.c

diff --git a/arch/blackfin/mm/init.c b/arch/blackfin/mm/init.c
index 570356d..eb1a12a 100644 (file)
--- a/arch/blackfin/mm/init.c
+++ b/arch/blackfin/mm/init.c
@@ -29,8 +29,8 @@
 
 #include <linux/swap.h>
 #include <linux/bootmem.h>
+#include <linux/uaccess.h>
 #include <asm/bfin-global.h>
-#include <asm/uaccess.h>
 #include <asm/l1layout.h>
 #include "blackfin_sram.h"
 
@@ -53,7 +53,7 @@ static unsigned long empty_bad_page;
 
 unsigned long empty_zero_page;
 
-void __init show_mem(void)
+void show_mem(void)
 {
        unsigned long i;
        int free = 0, total = 0, reserved = 0, shared = 0;
@@ -128,8 +128,8 @@ void __init paging_init(void)
 void __init mem_init(void)
 {
        unsigned int codek = 0, datak = 0, initk = 0;
+       unsigned int reservedpages = 0, freepages = 0;
        unsigned long tmp;
-       unsigned int len = _ramend - _rambase;
        unsigned long start_mem = memory_start;
        unsigned long end_mem = memory_end;
 
@@ -138,19 +138,36 @@ void __init mem_init(void)
 
        start_mem = PAGE_ALIGN(start_mem);
        max_mapnr = num_physpages = MAP_NR(high_memory);
-       printk(KERN_INFO "Physical pages: %lx\n", num_physpages);
+       printk(KERN_INFO "Kernel managed physical pages: %lu\n",
+               num_physpages);
 
        /* This will put all memory onto the freelists. */
        totalram_pages = free_all_bootmem();
 
+       reservedpages = 0;
+       for (tmp = 0; tmp < max_mapnr; tmp++)
+               if (PageReserved(pfn_to_page(tmp)))
+                       reservedpages++;
+       freepages =  max_mapnr - reservedpages;
+
+       /* do not count in kernel image between _rambase and _ramstart */
+       reservedpages -= (_ramstart - _rambase) >> PAGE_SHIFT;
+#if (defined(CONFIG_BFIN_ICACHE) && ANOMALY_05000263)
+       reservedpages += (_ramend - memory_end - DMA_UNCACHED_REGION) >>
+                               PAGE_SHIFT;
+#endif
+
        codek = (_etext - _stext) >> 10;
-       datak = (__bss_stop - __bss_start) >> 10;
        initk = (__init_end - __init_begin) >> 10;
+       datak = ((_ramstart - _rambase) >> 10) - codek - initk;
 
-       tmp = nr_free_pages() << PAGE_SHIFT;
        printk(KERN_INFO
-            "Memory available: %luk/%uk RAM, (%uk init code, %uk kernel code, %uk data, %uk dma)\n",
-            tmp >> 10, len >> 10, initk, codek, datak, DMA_UNCACHED_REGION >> 10);
+            "Memory available: %luk/%luk RAM, "
+               "(%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)));
 
        /* Initialize the blackfin L1 Memory. */
        l1sram_init();
@@ -168,42 +185,33 @@ void __init mem_init(void)
        }
 }
 
-#ifdef CONFIG_BLK_DEV_INITRD
-void __init free_initrd_mem(unsigned long start, unsigned long end)
-{
-       int pages = 0;
-       for (; start < end; start += PAGE_SIZE) {
-               ClearPageReserved(virt_to_page(start));
-               init_page_count(virt_to_page(start));
-               free_page(start);
-               totalram_pages++;
-               pages++;
-       }
-       printk(KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages);
-}
-#endif
-
-void __init free_initmem(void)
+static __init void free_init_pages(const char *what, unsigned long begin, unsigned long end)
 {
-#ifdef CONFIG_RAMKERNEL
        unsigned long addr;
-       /*
-        *      the following code should be cool even if these sections
-        *      are not page aligned.
-        */
-       addr = PAGE_ALIGN((unsigned long)(__init_begin));
        /* next to check that the page we free is not a partial page */
-       for (; addr + PAGE_SIZE < (unsigned long)(__init_end);
-            addr += PAGE_SIZE) {
+       for (addr = begin; addr + PAGE_SIZE <= end; addr += PAGE_SIZE) {
                ClearPageReserved(virt_to_page(addr));
                init_page_count(virt_to_page(addr));
                free_page(addr);
                totalram_pages++;
        }
-       printk(KERN_NOTICE
-              "Freeing unused kernel memory: %ldk freed (0x%x - 0x%x)\n",
-              (addr - PAGE_ALIGN((long)__init_begin)) >> 10,
-              (int)(PAGE_ALIGN((unsigned long)(__init_begin))),
-              (int)(addr - PAGE_SIZE));
+       printk(KERN_INFO "Freeing %s: %ldk freed\n", what, (end - begin) >> 10);
+}
+
+#ifdef CONFIG_BLK_DEV_INITRD
+void __init free_initrd_mem(unsigned long start, unsigned long end)
+{
+#ifndef CONFIG_MPU
+       free_init_pages("initrd memory", start, end);
+#endif
+}
+#endif
+
+void __init free_initmem(void)
+{
+#if defined CONFIG_RAMKERNEL && !defined CONFIG_MPU
+       free_init_pages("unused kernel memory",
+                       (unsigned long)(&__init_begin),
+                       (unsigned long)(&__init_end));
 #endif
 }