Commit 8818d89c authored by Mike Rapoport's avatar Mike Rapoport Committed by David S. Miller
Browse files

sparc32: split ramdisk detection and reservation to a helper function 



The detection and reservation of ramdisk memory were separated to allow
bootmem bitmap initialization after the ramdisk boundaries are detected.
Since the bootmem initialization is removed, the reservation of ramdisk
memory is done immediately after its boundaries are found.

Split the entire block into a separate helper function.

Signed-off-by: default avatarMike Rapoport <rppt@linux.vnet.ibm.com>
Suggested-by: default avatarSam Ravnborg <sam@ravnborg.org>
Reviewed-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cca079ef

arch/sparc/mm/init_32.c

+31 −25
Original line number Diff line number Diff line
@@ -102,6 +102,36 @@ static unsigned long calc_max_low_pfn(void) 
	return tmp;

}



static void __init find_ramdisk(unsigned long end_of_phys_memory)

{

#ifdef CONFIG_BLK_DEV_INITRD

	unsigned long size;



	/* Now have to check initial ramdisk, so that it won't pass

	 * the end of memory

	 */

	if (sparc_ramdisk_image) {

		if (sparc_ramdisk_image >= (unsigned long)&_end - 2 * PAGE_SIZE)

			sparc_ramdisk_image -= KERNBASE;

		initrd_start = sparc_ramdisk_image + phys_base;

		initrd_end = initrd_start + sparc_ramdisk_size;

		if (initrd_end > end_of_phys_memory) {

			printk(KERN_CRIT "initrd extends beyond end of memory "

			       "(0x%016lx > 0x%016lx)\ndisabling initrd\n",

			       initrd_end, end_of_phys_memory);

			initrd_start = 0;

		} else {

			/* Reserve the initrd image area. */

			size = initrd_end - initrd_start;

			memblock_reserve(initrd_start, size);



			initrd_start = (initrd_start - phys_base) + PAGE_OFFSET;

			initrd_end = (initrd_end - phys_base) + PAGE_OFFSET;

		}

	}

#endif

}



unsigned long __init bootmem_init(unsigned long *pages_avail)

{

	unsigned long start_pfn, bytes_avail, size;
@@ -160,32 +190,8 @@ unsigned long __init bootmem_init(unsigned long *pages_avail) 
		    high_pages >> (20 - PAGE_SHIFT));

	}



#ifdef CONFIG_BLK_DEV_INITRD

	/* Now have to check initial ramdisk, so that it won't pass

	 * the end of memory

	 */

	if (sparc_ramdisk_image) {

		if (sparc_ramdisk_image >= (unsigned long)&_end - 2 * PAGE_SIZE)

			sparc_ramdisk_image -= KERNBASE;

		initrd_start = sparc_ramdisk_image + phys_base;

		initrd_end = initrd_start + sparc_ramdisk_size;

		if (initrd_end > end_of_phys_memory) {

			printk(KERN_CRIT "initrd extends beyond end of memory "

		                 	 "(0x%016lx > 0x%016lx)\ndisabling initrd\n",

			       initrd_end, end_of_phys_memory);

			initrd_start = 0;

		}

	}



	if (initrd_start) {

		/* Reserve the initrd image area. */

		size = initrd_end - initrd_start;

		memblock_reserve(initrd_start, size);

	find_ramdisk(end_of_phys_memory);



		initrd_start = (initrd_start - phys_base) + PAGE_OFFSET;

		initrd_end = (initrd_end - phys_base) + PAGE_OFFSET;

	}

#endif

	/* Reserve the kernel text/data/bss. */

	size = (start_pfn << PAGE_SHIFT) - phys_base;

	memblock_reserve(phys_base, size);

CRA Git | Maintained and supported by SUSTech CRA and CCSE