1 files changed, 6 insertions, 1 deletions

diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 659c75d808dc..92bba32d9230 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -322,7 +322,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();
@@ -636,6 +636,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");
         }