UBUNTU: disable SND_ARMAACI, FTBFS

[mirror_ubuntu-zesty-kernel.git] / mm / memblock.c

diff --git a/mm/memblock.c b/mm/memblock.c
index 483197ef613f258838c40ca4e9869bc126e7e9ea..f4437b580376f4038bb9796847e29dabfb7ec6e2 100644 (file)
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -723,7 +723,7 @@ int __init_memblock memblock_free(phys_addr_t base, phys_addr_t size)
                     (unsigned long long)base + size - 1,
                     (void *)_RET_IP_);
 
-       kmemleak_free_part(__va(base), size);
+       kmemleak_free_part_phys(base, size);
        return memblock_remove_range(&memblock.reserved, base, size);
 }
 
@@ -813,6 +813,18 @@ int __init_memblock memblock_mark_nomap(phys_addr_t base, phys_addr_t size)
        return memblock_setclr_flag(base, size, 1, MEMBLOCK_NOMAP);
 }
 
+/**
+ * memblock_clear_nomap - Clear flag MEMBLOCK_NOMAP for a specified region.
+ * @base: the base phys addr of the region
+ * @size: the size of the region
+ *
+ * Return 0 on success, -errno on failure.
+ */
+int __init_memblock memblock_clear_nomap(phys_addr_t base, phys_addr_t size)
+{
+       return memblock_setclr_flag(base, size, 0, MEMBLOCK_NOMAP);
+}
+
 /**
  * __next_reserved_mem_region - next function for for_each_reserved_region()
  * @idx: pointer to u64 loop variable
@@ -1152,7 +1164,7 @@ static phys_addr_t __init memblock_alloc_range_nid(phys_addr_t size,
                 * The min_count is set to 0 so that memblock allocations are
                 * never reported as leaks.
                 */
-               kmemleak_alloc(__va(found), size, 0, 0);
+               kmemleak_alloc_phys(found, size, 0, 0);
                return found;
        }
        return 0;
@@ -1399,7 +1411,7 @@ void __init __memblock_free_early(phys_addr_t base, phys_addr_t size)
        memblock_dbg("%s: [%#016llx-%#016llx] %pF\n",
                     __func__, (u64)base, (u64)base + size - 1,
                     (void *)_RET_IP_);
-       kmemleak_free_part(__va(base), size);
+       kmemleak_free_part_phys(base, size);
        memblock_remove_range(&memblock.reserved, base, size);
 }
 
@@ -1419,7 +1431,7 @@ void __init __memblock_free_late(phys_addr_t base, phys_addr_t size)
        memblock_dbg("%s: [%#016llx-%#016llx] %pF\n",
                     __func__, (u64)base, (u64)base + size - 1,
                     (void *)_RET_IP_);
-       kmemleak_free_part(__va(base), size);
+       kmemleak_free_part_phys(base, size);
        cursor = PFN_UP(base);
        end = PFN_DOWN(base + size);
 
@@ -1438,6 +1450,11 @@ phys_addr_t __init_memblock memblock_phys_mem_size(void)
        return memblock.memory.total_size;
 }
 
+phys_addr_t __init_memblock memblock_reserved_size(void)
+{
+       return memblock.reserved.total_size;
+}
+
 phys_addr_t __init memblock_mem_size(unsigned long limit_pfn)
 {
        unsigned long pages = 0;
@@ -1509,11 +1526,37 @@ void __init memblock_enforce_memory_limit(phys_addr_t limit)
                              (phys_addr_t)ULLONG_MAX);
 }
 
+void __init memblock_cap_memory_range(phys_addr_t base, phys_addr_t size)
+{
+       int start_rgn, end_rgn;
+       int i, ret;
+
+       if (!size)
+               return;
+
+       ret = memblock_isolate_range(&memblock.memory, base, size,
+                                               &start_rgn, &end_rgn);
+       if (ret)
+               return;
+
+       /* remove all the MAP regions */
+       for (i = memblock.memory.cnt - 1; i >= end_rgn; i--)
+               if (!memblock_is_nomap(&memblock.memory.regions[i]))
+                       memblock_remove_region(&memblock.memory, i);
+
+       for (i = start_rgn - 1; i >= 0; i--)
+               if (!memblock_is_nomap(&memblock.memory.regions[i]))
+                       memblock_remove_region(&memblock.memory, i);
+
+       /* truncate the reserved regions */
+       memblock_remove_range(&memblock.reserved, 0, base);
+       memblock_remove_range(&memblock.reserved,
+                       base + size, (phys_addr_t)ULLONG_MAX);
+}
+
 void __init memblock_mem_limit_remove_map(phys_addr_t limit)
 {
-       struct memblock_type *type = &memblock.memory;
        phys_addr_t max_addr;
-       int i, ret, start_rgn, end_rgn;
 
        if (!limit)
                return;
@@ -1524,19 +1567,7 @@ void __init memblock_mem_limit_remove_map(phys_addr_t limit)
        if (max_addr == (phys_addr_t)ULLONG_MAX)
                return;
 
-       ret = memblock_isolate_range(type, max_addr, (phys_addr_t)ULLONG_MAX,
-                               &start_rgn, &end_rgn);
-       if (ret)
-               return;
-
-       /* remove all the MAP regions above the limit */
-       for (i = end_rgn - 1; i >= start_rgn; i--) {
-               if (!memblock_is_nomap(&type->regions[i]))
-                       memblock_remove_region(type, i);
-       }
-       /* truncate the reserved regions */
-       memblock_remove_range(&memblock.reserved, max_addr,
-                             (phys_addr_t)ULLONG_MAX);
+       memblock_cap_memory_range(0, max_addr);
 }
 
 static int __init_memblock memblock_search(struct memblock_type *type, phys_addr_t addr)