Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

[linux-2.6-block.git] / arch / arm / mm / init.c

diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 15dddfe43319547d2e3c81a80a33f0315a3e2c55..c2daabbe0af05da23a469efe0ea2ed1a6eb2eb7b 100644 (file)
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -282,15 +282,12 @@ void __init arm_memblock_init(const struct machine_desc *mdesc)
 
 void __init bootmem_init(void)
 {
-       unsigned long min, max_low, max_high;
-
        memblock_allow_resize();
-       max_low = max_high = 0;
 
-       find_limits(&min, &max_low, &max_high);
+       find_limits(&min_low_pfn, &max_low_pfn, &max_pfn);
 
-       early_memtest((phys_addr_t)min << PAGE_SHIFT,
-                     (phys_addr_t)max_low << PAGE_SHIFT);
+       early_memtest((phys_addr_t)min_low_pfn << PAGE_SHIFT,
+                     (phys_addr_t)max_low_pfn << PAGE_SHIFT);
 
        /*
         * Sparsemem tries to allocate bootmem in memory_present(),
@@ -308,16 +305,7 @@ void __init bootmem_init(void)
         * the sparse mem_map arrays initialized by sparse_init()
         * for memmap_init_zone(), otherwise all PFNs are invalid.
         */
-       zone_sizes_init(min, max_low, max_high);
-
-       /*
-        * This doesn't seem to be used by the Linux memory manager any
-        * more, but is used by ll_rw_block.  If we can get rid of it, we
-        * also get rid of some of the stuff above as well.
-        */
-       min_low_pfn = min;
-       max_low_pfn = max_low;
-       max_pfn = max_high;
+       zone_sizes_init(min_low_pfn, max_low_pfn, max_pfn);
 }
 
 /*
@@ -498,55 +486,6 @@ void __init mem_init(void)
 
        mem_init_print_info(NULL);
 
-#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)
-
-       pr_notice("Virtual kernel memory layout:\n"
-                       "    vector  : 0x%08lx - 0x%08lx   (%4ld kB)\n"
-#ifdef CONFIG_HAVE_TCM
-                       "    DTCM    : 0x%08lx - 0x%08lx   (%4ld kB)\n"
-                       "    ITCM    : 0x%08lx - 0x%08lx   (%4ld kB)\n"
-#endif
-                       "    fixmap  : 0x%08lx - 0x%08lx   (%4ld kB)\n"
-                       "    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
-#ifdef CONFIG_MODULES
-                       "    modules : 0x%08lx - 0x%08lx   (%4ld MB)\n"
-#endif
-                       "      .text : 0x%p" " - 0x%p" "   (%4td kB)\n"
-                       "      .init : 0x%p" " - 0x%p" "   (%4td kB)\n"
-                       "      .data : 0x%p" " - 0x%p" "   (%4td kB)\n"
-                       "       .bss : 0x%p" " - 0x%p" "   (%4td kB)\n",
-
-                       MLK(VECTORS_BASE, VECTORS_BASE + PAGE_SIZE),
-#ifdef CONFIG_HAVE_TCM
-                       MLK(DTCM_OFFSET, (unsigned long) dtcm_end),
-                       MLK(ITCM_OFFSET, (unsigned long) itcm_end),
-#endif
-                       MLK(FIXADDR_START, FIXADDR_END),
-                       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
-#ifdef CONFIG_MODULES
-                       MLM(MODULES_VADDR, MODULES_END),
-#endif
-
-                       MLK_ROUNDUP(_text, _etext),
-                       MLK_ROUNDUP(__init_begin, __init_end),
-                       MLK_ROUNDUP(_sdata, _edata),
-                       MLK_ROUNDUP(__bss_start, __bss_stop));
-
-#undef MLK
-#undef MLM
-#undef MLK_ROUNDUP
-
        /*
         * Check boundaries twice: Some fundamental inconsistencies can
         * be detected at build time already.