Merge tag 'drm-next-2019-03-15' of git://anongit.freedesktop.org/drm/drm

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

diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 32e4845af2b66fe1af4c1b43601b05b1fd1c51f8..15dddfe43319547d2e3c81a80a33f0315a3e2c55 100644 (file)
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -50,26 +50,7 @@ unsigned long __init __clear_cr(unsigned long mask)
 }
 #endif
 
-static phys_addr_t phys_initrd_start __initdata = 0;
-static unsigned long phys_initrd_size __initdata = 0;
-
-static int __init early_initrd(char *p)
-{
-       phys_addr_t start;
-       unsigned long size;
-       char *endp;
-
-       start = memparse(p, &endp);
-       if (*endp == ',') {
-               size = memparse(endp + 1, NULL);
-
-               phys_initrd_start = start;
-               phys_initrd_size = size;
-       }
-       return 0;
-}
-early_param("initrd", early_initrd);
-
+#ifdef CONFIG_BLK_DEV_INITRD
 static int __init parse_tag_initrd(const struct tag *tag)
 {
        pr_warn("ATAG_INITRD is deprecated; "
@@ -89,6 +70,7 @@ static int __init parse_tag_initrd2(const struct tag *tag)
 }
 
 __tagtable(ATAG_INITRD2, parse_tag_initrd2);
+#endif
 
 static void __init find_limits(unsigned long *min, unsigned long *max_low,
                               unsigned long *max_high)
@@ -223,7 +205,11 @@ phys_addr_t __init arm_memblock_steal(phys_addr_t size, phys_addr_t align)
 
        BUG_ON(!arm_memblock_steal_permitted);
 
-       phys = memblock_alloc_base(size, align, MEMBLOCK_ALLOC_ANYWHERE);
+       phys = memblock_phys_alloc(size, align);
+       if (!phys)
+               panic("Failed to steal %pa bytes at %pS\n",
+                     &size, (void *)_RET_IP_);
+
        memblock_free(phys, size);
        memblock_remove(phys, size);
 
@@ -236,12 +222,6 @@ static void __init arm_initrd_init(void)
        phys_addr_t start;
        unsigned long size;
 
-       /* FDT scan will populate initrd_start */
-       if (initrd_start && !phys_initrd_size) {
-               phys_initrd_start = __virt_to_phys(initrd_start);
-               phys_initrd_size = initrd_end - initrd_start;
-       }
-
        initrd_start = initrd_end = 0;
 
        if (!phys_initrd_size)