Merge tag 'driver-core-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / arm64 / mm / init.c

diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index d933589c48e82c394ab8a18363418bc5c11a2ba7..be9481cdf3b9b4bf1b43d717c596dedd81aa3a1c 100644 (file)
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -600,7 +600,7 @@ void free_initmem(void)
 {
        free_reserved_area(lm_alias(__init_begin),
                           lm_alias(__init_end),
-                          0, "unused kernel");
+                          POISON_FREE_INITMEM, "unused kernel");
        /*
         * Unmap the __init region but leave the VM area in place. This
         * prevents the region from being reused for kernel modules, which
@@ -609,18 +609,6 @@ void free_initmem(void)
        unmap_kernel_range((u64)__init_begin, (u64)(__init_end - __init_begin));
 }
 
-#ifdef CONFIG_BLK_DEV_INITRD
-void __init free_initrd_mem(unsigned long start, unsigned long end)
-{
-       unsigned long aligned_start, aligned_end;
-
-       aligned_start = __virt_to_phys(start) & PAGE_MASK;
-       aligned_end = PAGE_ALIGN(__virt_to_phys(end));
-       memblock_free(aligned_start, aligned_end - aligned_start);
-       free_reserved_area((void *)start, (void *)end, 0, "initrd");
-}
-#endif
-
 /*
  * Dump out memory limit information on panic.
  */