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

Commit a8a51a88 authored by Yinghai Lu's avatar Yinghai Lu Committed by H. Peter Anvin
Browse files

x86: Add get_ramdisk_image/size() 



There are several places to find ramdisk information early for reserving
and relocating.

Use accessor functions to make code more readable and consistent.

Later will add ext_ramdisk_image/size in those functions to support
loading ramdisk above 4g.

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/1359058816-7615-16-git-send-email-yinghai@kernel.org


Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 1b8c78be

arch/x86/kernel/setup.c

+21 −8
Original line number Diff line number Diff line
@@ -294,12 +294,25 @@ static void __init reserve_brk(void) 


#ifdef CONFIG_BLK_DEV_INITRD



static u64 __init get_ramdisk_image(void)

{

	u64 ramdisk_image = boot_params.hdr.ramdisk_image;



	return ramdisk_image;

}

static u64 __init get_ramdisk_size(void)

{

	u64 ramdisk_size = boot_params.hdr.ramdisk_size;



	return ramdisk_size;

}



#define MAX_MAP_CHUNK	(NR_FIX_BTMAPS << PAGE_SHIFT)

static void __init relocate_initrd(void)

{

	/* Assume only end is not page aligned */

	u64 ramdisk_image = boot_params.hdr.ramdisk_image;

	u64 ramdisk_size  = boot_params.hdr.ramdisk_size;

	u64 ramdisk_image = get_ramdisk_image();

	u64 ramdisk_size  = get_ramdisk_size();

	u64 area_size     = PAGE_ALIGN(ramdisk_size);

	u64 ramdisk_here;

	unsigned long slop, clen, mapaddr;
@@ -338,8 +351,8 @@ static void __init relocate_initrd(void) 
		ramdisk_size  -= clen;

	}



	ramdisk_image = boot_params.hdr.ramdisk_image;

	ramdisk_size  = boot_params.hdr.ramdisk_size;

	ramdisk_image = get_ramdisk_image();

	ramdisk_size  = get_ramdisk_size();

	printk(KERN_INFO "Move RAMDISK from [mem %#010llx-%#010llx] to"

		" [mem %#010llx-%#010llx]\n",

		ramdisk_image, ramdisk_image + ramdisk_size - 1,
@@ -363,8 +376,8 @@ static u64 __init get_mem_size(unsigned long limit_pfn) 
static void __init early_reserve_initrd(void)

{

	/* Assume only end is not page aligned */

	u64 ramdisk_image = boot_params.hdr.ramdisk_image;

	u64 ramdisk_size  = boot_params.hdr.ramdisk_size;

	u64 ramdisk_image = get_ramdisk_image();

	u64 ramdisk_size  = get_ramdisk_size();

	u64 ramdisk_end   = PAGE_ALIGN(ramdisk_image + ramdisk_size);



	if (!boot_params.hdr.type_of_loader ||
@@ -376,8 +389,8 @@ static void __init early_reserve_initrd(void) 
static void __init reserve_initrd(void)

{

	/* Assume only end is not page aligned */

	u64 ramdisk_image = boot_params.hdr.ramdisk_image;

	u64 ramdisk_size  = boot_params.hdr.ramdisk_size;

	u64 ramdisk_image = get_ramdisk_image();

	u64 ramdisk_size  = get_ramdisk_size();

	u64 ramdisk_end   = PAGE_ALIGN(ramdisk_image + ramdisk_size);

	u64 mapped_size;