Merge branch 'for_3.14/arm-no-bootmem' of git://git.kernel.org/pub/scm/linux/kernel...

diff --combined arch/arm/kernel/setup.c
index 987a7f5bce5f1759d73c01a80099cea57a94025d,e9f629f21769c856e87bfc55ef5f5d4a22768007..916a8cf2332861d6d032e9f5b4381b89aca44916
--- 1/arch/arm/kernel/setup.c
--- 2/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@@ -817,7 -817,7 +817,7 @@@ static void __init reserve_crashkernel(
        if (ret)
                return;
  
-       ret = reserve_bootmem(crash_base, crash_size, BOOTMEM_EXCLUSIVE);
+       ret = memblock_reserve(crash_base, crash_size);
        if (ret < 0) {
                printk(KERN_WARNING "crashkernel reservation failed - "
                       "memory is in use (0x%lx)\n", (unsigned long)crash_base);
@@@ -873,6 -873,8 +873,6 @@@ void __init setup_arch(char **cmdline_p
        machine_desc = mdesc;
        machine_name = mdesc->name;
  
 -      setup_dma_zone(mdesc);
 -
        if (mdesc->reboot_mode != REBOOT_HARD)
                reboot_mode = mdesc->reboot_mode;
  
@@@ -890,7 -892,6 +890,7 @@@
        sort(&meminfo.bank, meminfo.nr_banks, sizeof(meminfo.bank[0]), meminfo_cmp, NULL);
  
        early_paging_init(mdesc, lookup_processor_type(read_cpuid_id()));
 +      setup_dma_zone(mdesc);
        sanity_check_meminfo();
        arm_memblock_init(&meminfo, mdesc);
  

diff --combined arch/arm/mm/init.c
index 1f7b19a470606726595ebc692f3b05aae94729c6,6dd66a999d9f2c69b291b300d8f79e63577a503b..58abee63534fdeebc94082a345aa1f18030c93ca
--- 1/arch/arm/mm/init.c
--- 2/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@@ -145,58 -145,6 +145,6 @@@ static void __init find_limits(unsigne
        *max_high = bank_pfn_end(&mi->bank[mi->nr_banks - 1]);
  }
  
- static void __init arm_bootmem_init(unsigned long start_pfn,
-       unsigned long end_pfn)
- {
-       struct memblock_region *reg;
-       unsigned int boot_pages;
-       phys_addr_t bitmap;
-       pg_data_t *pgdat;
- 
-       /*
-        * Allocate the bootmem bitmap page.  This must be in a region
-        * of memory which has already been mapped.
-        */
-       boot_pages = bootmem_bootmap_pages(end_pfn - start_pfn);
-       bitmap = memblock_alloc_base(boot_pages << PAGE_SHIFT, L1_CACHE_BYTES,
-                               __pfn_to_phys(end_pfn));
- 
-       /*
-        * Initialise the bootmem allocator, handing the
-        * memory banks over to bootmem.
-        */
-       node_set_online(0);
-       pgdat = NODE_DATA(0);
-       init_bootmem_node(pgdat, __phys_to_pfn(bitmap), start_pfn, end_pfn);
- 
-       /* Free the lowmem regions from memblock into bootmem. */
-       for_each_memblock(memory, reg) {
-               unsigned long start = memblock_region_memory_base_pfn(reg);
-               unsigned long end = memblock_region_memory_end_pfn(reg);
- 
-               if (end >= end_pfn)
-                       end = end_pfn;
-               if (start >= end)
-                       break;
- 
-               free_bootmem(__pfn_to_phys(start), (end - start) << PAGE_SHIFT);
-       }
- 
-       /* Reserve the lowmem memblock reserved regions in bootmem. */
-       for_each_memblock(reserved, reg) {
-               unsigned long start = memblock_region_reserved_base_pfn(reg);
-               unsigned long end = memblock_region_reserved_end_pfn(reg);
- 
-               if (end >= end_pfn)
-                       end = end_pfn;
-               if (start >= end)
-                       break;
- 
-               reserve_bootmem(__pfn_to_phys(start),
-                               (end - start) << PAGE_SHIFT, BOOTMEM_DEFAULT);
-       }
- }
- 
  #ifdef CONFIG_ZONE_DMA
  
  phys_addr_t arm_dma_zone_size __read_mostly;
@@@ -229,14 -177,14 +177,14 @@@ void __init setup_dma_zone(const struc
  #ifdef CONFIG_ZONE_DMA
        if (mdesc->dma_zone_size) {
                arm_dma_zone_size = mdesc->dma_zone_size;
 -              arm_dma_limit = PHYS_OFFSET + arm_dma_zone_size - 1;
 +              arm_dma_limit = __pv_phys_offset + arm_dma_zone_size - 1;
        } else
                arm_dma_limit = 0xffffffff;
        arm_dma_pfn_limit = arm_dma_limit >> PAGE_SHIFT;
  #endif
  }
  
- static void __init arm_bootmem_free(unsigned long min, unsigned long max_low,
+ static void __init zone_sizes_init(unsigned long min, unsigned long max_low,
        unsigned long max_high)
  {
        unsigned long zone_size[MAX_NR_ZONES], zhole_size[MAX_NR_ZONES];
@@@ -384,7 -332,6 +332,6 @@@ void __init arm_memblock_init(struct me
        dma_contiguous_reserve(min(arm_dma_limit, arm_lowmem_limit));
  
        arm_memblock_steal_permitted = false;
-       memblock_allow_resize();
        memblock_dump_all();
  }
  
@@@ -392,12 -339,11 +339,11 @@@ 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);
  
-       arm_bootmem_init(min, max_low);
- 
        /*
         * Sparsemem tries to allocate bootmem in memory_present(),
         * so must be done after the fixed reservations
@@@ -414,7 -360,7 +360,7 @@@
         * the sparse mem_map arrays initialized by sparse_init()
         * for memmap_init_zone(), otherwise all PFNs are invalid.
         */
-       arm_bootmem_free(min, max_low, max_high);
+       zone_sizes_init(min, max_low, max_high);
  
        /*
         * This doesn't seem to be used by the Linux memory manager any
@@@ -587,7 -533,7 +533,7 @@@ void __init mem_init(void
        extern u32 itcm_end;
  #endif
  
-       max_mapnr   = pfn_to_page(max_pfn + PHYS_PFN_OFFSET) - mem_map;
+       set_max_mapnr(pfn_to_page(max_pfn) - mem_map);
  
        /* this will put all unused low memory onto the freelists */
        free_unused_memmap(&meminfo);