Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68b32f36 authored by Russell King's avatar Russell King
Browse files

ARM: mm: clean up initrd initialisation 



Rather than repeatedly testing phys_initrd_size to see if the initrd
is still enabled, return from the new function to avoid executing the
remaining initialisation.

Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
parent 39286248

arch/arm/mm/init.c

+15 −12
Original line number Diff line number Diff line
@@ -236,26 +236,29 @@ static void __init arm_initrd_init(void) 
		phys_initrd_start = __virt_to_phys(initrd_start);

		phys_initrd_size = initrd_end - initrd_start;

	}



	initrd_start = initrd_end = 0;

	if (phys_initrd_size &&

	    !memblock_is_region_memory(phys_initrd_start, phys_initrd_size)) {



	if (!phys_initrd_size)

		return;



	if (!memblock_is_region_memory(phys_initrd_start, phys_initrd_size)) {

		pr_err("INITRD: 0x%08llx+0x%08lx is not a memory region - disabling initrd\n",

		       (u64)phys_initrd_start, phys_initrd_size);

		phys_initrd_start = phys_initrd_size = 0;

		return;

	}

	if (phys_initrd_size &&

	    memblock_is_region_reserved(phys_initrd_start, phys_initrd_size)) {



	if (memblock_is_region_reserved(phys_initrd_start, phys_initrd_size)) {

		pr_err("INITRD: 0x%08llx+0x%08lx overlaps in-use memory region - disabling initrd\n",

		       (u64)phys_initrd_start, phys_initrd_size);

		phys_initrd_start = phys_initrd_size = 0;

		return;

	}

	if (phys_initrd_size) {



	memblock_reserve(phys_initrd_start, phys_initrd_size);



	/* Now convert initrd to virtual addresses */

	initrd_start = __phys_to_virt(phys_initrd_start);

	initrd_end = initrd_start + phys_initrd_size;

	}

#endif

}