Merge branch 'akpm' (patches from Andrew)

[linux-2.6-microblaze.git] / arch / arm64 / mm / init.c

diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index bf5b8a5..b16be52 100644 (file)
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -110,57 +110,6 @@ static void __init reserve_crashkernel(void)
 }
 #endif /* CONFIG_KEXEC_CORE */
 
-#ifdef CONFIG_CRASH_DUMP
-static int __init early_init_dt_scan_elfcorehdr(unsigned long node,
-               const char *uname, int depth, void *data)
-{
-       const __be32 *reg;
-       int len;
-
-       if (depth != 1 || strcmp(uname, "chosen") != 0)
-               return 0;
-
-       reg = of_get_flat_dt_prop(node, "linux,elfcorehdr", &len);
-       if (!reg || (len < (dt_root_addr_cells + dt_root_size_cells)))
-               return 1;
-
-       elfcorehdr_addr = dt_mem_next_cell(dt_root_addr_cells, &reg);
-       elfcorehdr_size = dt_mem_next_cell(dt_root_size_cells, &reg);
-
-       return 1;
-}
-
-/*
- * reserve_elfcorehdr() - reserves memory for elf core header
- *
- * This function reserves the memory occupied by an elf core header
- * described in the device tree. This region contains all the
- * information about primary kernel's core image and is used by a dump
- * capture kernel to access the system memory on primary kernel.
- */
-static void __init reserve_elfcorehdr(void)
-{
-       of_scan_flat_dt(early_init_dt_scan_elfcorehdr, NULL);
-
-       if (!elfcorehdr_size)
-               return;
-
-       if (memblock_is_region_reserved(elfcorehdr_addr, elfcorehdr_size)) {
-               pr_warn("elfcorehdr is overlapped\n");
-               return;
-       }
-
-       memblock_reserve(elfcorehdr_addr, elfcorehdr_size);
-
-       pr_info("Reserving %lldKB of memory at 0x%llx for elfcorehdr\n",
-               elfcorehdr_size >> 10, elfcorehdr_addr);
-}
-#else
-static void __init reserve_elfcorehdr(void)
-{
-}
-#endif /* CONFIG_CRASH_DUMP */
-
 /*
  * Return the maximum physical address for a zone accessible by the given bits
  * limit. If DRAM starts above 32-bit, expand the zone to the maximum
@@ -271,45 +220,10 @@ static int __init early_mem(char *p)
 }
 early_param("mem", early_mem);
 
-static int __init early_init_dt_scan_usablemem(unsigned long node,
-               const char *uname, int depth, void *data)
-{
-       struct memblock_region *usablemem = data;
-       const __be32 *reg;
-       int len;
-
-       if (depth != 1 || strcmp(uname, "chosen") != 0)
-               return 0;
-
-       reg = of_get_flat_dt_prop(node, "linux,usable-memory-range", &len);
-       if (!reg || (len < (dt_root_addr_cells + dt_root_size_cells)))
-               return 1;
-
-       usablemem->base = dt_mem_next_cell(dt_root_addr_cells, &reg);
-       usablemem->size = dt_mem_next_cell(dt_root_size_cells, &reg);
-
-       return 1;
-}
-
-static void __init fdt_enforce_memory_region(void)
-{
-       struct memblock_region reg = {
-               .size = 0,
-       };
-
-       of_scan_flat_dt(early_init_dt_scan_usablemem, &reg);
-
-       if (reg.size)
-               memblock_cap_memory_range(reg.base, reg.size);
-}
-
 void __init arm64_memblock_init(void)
 {
        const s64 linear_region_size = PAGE_END - _PAGE_OFFSET(vabits_actual);
 
-       /* Handle linux,usable-memory-range property */
-       fdt_enforce_memory_region();
-
        /* Remove memory above our supported physical address size */
        memblock_remove(1ULL << PHYS_MASK_SHIFT, ULLONG_MAX);
 
@@ -418,8 +332,6 @@ void __init arm64_memblock_init(void)
 
        early_init_fdt_scan_reserved_mem();
 
-       reserve_elfcorehdr();
-
        high_memory = __va(memblock_end_of_DRAM() - 1) + 1;
 }