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

[pandora-kernel.git] / arch / arm / mm / init.c

diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index a04ffbb..0ed29bf 100644 (file)
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -17,12 +17,14 @@
 #include <linux/initrd.h>
 #include <linux/sort.h>
 #include <linux/highmem.h>
+#include <linux/gfp.h>
 
 #include <asm/mach-types.h>
 #include <asm/sections.h>
 #include <asm/setup.h>
 #include <asm/sizes.h>
 #include <asm/tlb.h>
+#include <asm/fixmap.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
@@ -32,19 +34,21 @@
 static unsigned long phys_initrd_start __initdata = 0;
 static unsigned long phys_initrd_size __initdata = 0;
 
-static void __init early_initrd(char **p)
+static int __init early_initrd(char *p)
 {
        unsigned long start, size;
+       char *endp;
 
-       start = memparse(*p, p);
-       if (**p == ',') {
-               size = memparse((*p) + 1, p);
+       start = memparse(p, &endp);
+       if (*endp == ',') {
+               size = memparse(endp + 1, NULL);
 
                phys_initrd_start = start;
                phys_initrd_size = size;
        }
+       return 0;
 }
-__early_param("initrd=", early_initrd);
+early_param("initrd", early_initrd);
 
 static int __init parse_tag_initrd(const struct tag *tag)
 {
@@ -82,9 +86,6 @@ void show_mem(void)
        printk("Mem-info:\n");
        show_free_areas();
        for_each_online_node(node) {
-               pg_data_t *n = NODE_DATA(node);
-               struct page *map = pgdat_page_nr(n, 0) - n->node_start_pfn;
-
                for_each_nodebank (i,mi,node) {
                        struct membank *bank = &mi->bank[i];
                        unsigned int pfn1, pfn2;
@@ -93,8 +94,8 @@ void show_mem(void)
                        pfn1 = bank_pfn_start(bank);
                        pfn2 = bank_pfn_end(bank);
 
-                       page = map + pfn1;
-                       end  = map + pfn2;
+                       page = pfn_to_page(pfn1);
+                       end  = pfn_to_page(pfn2 - 1) + 1;
 
                        do {
                                total++;
@@ -560,7 +561,7 @@ static void __init free_unused_memmap_node(int node, struct meminfo *mi)
  */
 void __init mem_init(void)
 {
-       unsigned int codesize, datasize, initsize;
+       unsigned long reserved_pages, free_pages;
        int i, node;
 
 #ifndef CONFIG_DISCONTIGMEM
@@ -596,6 +597,30 @@ void __init mem_init(void)
        totalram_pages += totalhigh_pages;
 #endif
 
+       reserved_pages = free_pages = 0;
+
+       for_each_online_node(node) {
+               for_each_nodebank(i, &meminfo, node) {
+                       struct membank *bank = &meminfo.bank[i];
+                       unsigned int pfn1, pfn2;
+                       struct page *page, *end;
+
+                       pfn1 = bank_pfn_start(bank);
+                       pfn2 = bank_pfn_end(bank);
+
+                       page = pfn_to_page(pfn1);
+                       end  = pfn_to_page(pfn2 - 1) + 1;
+
+                       do {
+                               if (PageReserved(page))
+                                       reserved_pages++;
+                               else if (!page_count(page))
+                                       free_pages++;
+                               page++;
+                       } while (page < end);
+               }
+       }
+
        /*
         * Since our memory may not be contiguous, calculate the
         * real number of pages we have in this system
@@ -608,16 +633,71 @@ void __init mem_init(void)
        }
        printk(" = %luMB total\n", num_physpages >> (20 - PAGE_SHIFT));
 
-       codesize = _etext - _text;
-       datasize = _end - _data;
-       initsize = __init_end - __init_begin;
-
-       printk(KERN_NOTICE "Memory: %luKB available (%dK code, "
-               "%dK data, %dK init, %luK highmem)\n",
-               nr_free_pages() << (PAGE_SHIFT-10), codesize >> 10,
-               datasize >> 10, initsize >> 10,
+       printk(KERN_NOTICE "Memory: %luk/%luk available, %luk reserved, %luK highmem\n",
+               nr_free_pages() << (PAGE_SHIFT-10),
+               free_pages << (PAGE_SHIFT-10),
+               reserved_pages << (PAGE_SHIFT-10),
                totalhigh_pages << (PAGE_SHIFT-10));
 
+#define MLK(b, t) b, t, ((t) - (b)) >> 10
+#define MLM(b, t) b, t, ((t) - (b)) >> 20
+#define MLK_ROUNDUP(b, t) b, t, DIV_ROUND_UP(((t) - (b)), SZ_1K)
+
+       printk(KERN_NOTICE "Virtual kernel memory layout:\n"
+                       "    vector  : 0x%08lx - 0x%08lx   (%4ld kB)\n"
+                       "    fixmap  : 0x%08lx - 0x%08lx   (%4ld kB)\n"
+#ifdef CONFIG_MMU
+                       "    DMA     : 0x%08lx - 0x%08lx   (%4ld MB)\n"
+#endif
+                       "    vmalloc : 0x%08lx - 0x%08lx   (%4ld MB)\n"
+                       "    lowmem  : 0x%08lx - 0x%08lx   (%4ld MB)\n"
+#ifdef CONFIG_HIGHMEM
+                       "    pkmap   : 0x%08lx - 0x%08lx   (%4ld MB)\n"
+#endif
+                       "    modules : 0x%08lx - 0x%08lx   (%4ld MB)\n"
+                       "      .init : 0x%p" " - 0x%p" "   (%4d kB)\n"
+                       "      .text : 0x%p" " - 0x%p" "   (%4d kB)\n"
+                       "      .data : 0x%p" " - 0x%p" "   (%4d kB)\n",
+
+                       MLK(UL(CONFIG_VECTORS_BASE), UL(CONFIG_VECTORS_BASE) +
+                               (PAGE_SIZE)),
+                       MLK(FIXADDR_START, FIXADDR_TOP),
+#ifdef CONFIG_MMU
+                       MLM(CONSISTENT_BASE, CONSISTENT_END),
+#endif
+                       MLM(VMALLOC_START, VMALLOC_END),
+                       MLM(PAGE_OFFSET, (unsigned long)high_memory),
+#ifdef CONFIG_HIGHMEM
+                       MLM(PKMAP_BASE, (PKMAP_BASE) + (LAST_PKMAP) *
+                               (PAGE_SIZE)),
+#endif
+                       MLM(MODULES_VADDR, MODULES_END),
+
+                       MLK_ROUNDUP(__init_begin, __init_end),
+                       MLK_ROUNDUP(_text, _etext),
+                       MLK_ROUNDUP(_data, _edata));
+
+#undef MLK
+#undef MLM
+#undef MLK_ROUNDUP
+
+       /*
+        * Check boundaries twice: Some fundamental inconsistencies can
+        * be detected at build time already.
+        */
+#ifdef CONFIG_MMU
+       BUILD_BUG_ON(VMALLOC_END                        > CONSISTENT_BASE);
+       BUG_ON(VMALLOC_END                              > CONSISTENT_BASE);
+
+       BUILD_BUG_ON(TASK_SIZE                          > MODULES_VADDR);
+       BUG_ON(TASK_SIZE                                > MODULES_VADDR);
+#endif
+
+#ifdef CONFIG_HIGHMEM
+       BUILD_BUG_ON(PKMAP_BASE + LAST_PKMAP * PAGE_SIZE > PAGE_OFFSET);
+       BUG_ON(PKMAP_BASE + LAST_PKMAP * PAGE_SIZE      > PAGE_OFFSET);
+#endif
+
        if (PAGE_SIZE >= 16384 && num_physpages <= 128) {
                extern int sysctl_overcommit_memory;
                /*