Merge tag 'ronx-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux...

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

diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index dc2db779cdf4e29de4693e29b8ba1da2ae6bf25f..67b15426b9c6f1969844aeeb335ba3cce66fa657 100644 (file)
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -323,7 +323,7 @@ void __init arm_memblock_init(const struct machine_desc *mdesc)
         * reserve memory for DMA contigouos allocations,
         * must come from DMA area inside low memory
         */
-       dma_contiguous_reserve(min(arm_dma_limit, arm_lowmem_limit));
+       dma_contiguous_reserve(arm_dma_limit);
 
        arm_memblock_steal_permitted = false;
        memblock_dump_all();
@@ -781,6 +781,11 @@ static int keep_initrd;
 void free_initrd_mem(unsigned long start, unsigned long end)
 {
        if (!keep_initrd) {
+               if (start == initrd_start)
+                       start = round_down(start, PAGE_SIZE);
+               if (end == initrd_end)
+                       end = round_up(end, PAGE_SIZE);
+
                poison_init_mem((void *)start, PAGE_ALIGN(end) - start);
                free_reserved_area((void *)start, (void *)end, -1, "initrd");
        }