ia64/xen-unstable

changeset 9864:da5a42b7d719

[IA64] fix initrd start

Fix initrd start to work with P2M/VP

Signed-off-by: Akio Takebe <takebe_akio@jp.fujitsu.com>
author awilliam@xenbuild.aw
date Mon May 08 13:05:47 2006 -0600 (2006-05-08)
parents cd1df13fb1c4
children ee97d247a3b7
files xen/arch/ia64/xen/dom_fw.c xen/arch/ia64/xen/xensetup.c
line diff
     1.1 --- a/xen/arch/ia64/xen/dom_fw.c	Mon May 08 12:56:57 2006 -0600
     1.2 +++ b/xen/arch/ia64/xen/dom_fw.c	Mon May 08 13:05:47 2006 -0600
     1.3 @@ -1019,7 +1019,8 @@ dom_fw_init (struct domain *d, const cha
     1.4  	if (d == dom0) {
     1.5  		// XXX CONFIG_XEN_IA64_DOM0_VP
     1.6  		// initrd_start address is hard coded in start_kernel()
     1.7 -		bp->initrd_start = ia64_boot_param->initrd_start;
     1.8 +		bp->initrd_start = (dom0_start+dom0_size) -
     1.9 +		  (PAGE_ALIGN(ia64_boot_param->initrd_size) + 4*1024*1024);
    1.10  		bp->initrd_size = ia64_boot_param->initrd_size;
    1.11  	}
    1.12  	else {
     2.1 --- a/xen/arch/ia64/xen/xensetup.c	Mon May 08 12:56:57 2006 -0600
     2.2 +++ b/xen/arch/ia64/xen/xensetup.c	Mon May 08 13:05:47 2006 -0600
     2.3 @@ -415,8 +415,7 @@ printk("About to call domain_create()\n"
     2.4      printk("About to call construct_dom0()\n");
     2.5      dom0_memory_start = (unsigned long) __va(initial_images_start);
     2.6      dom0_memory_size = ia64_boot_param->domain_size;
     2.7 -    dom0_initrd_start = (unsigned long) __va(initial_images_start +
     2.8 -			     PAGE_ALIGN(ia64_boot_param->domain_size));
     2.9 +    dom0_initrd_start = (unsigned long) __va(ia64_boot_param->initrd_start);
    2.10      dom0_initrd_size = ia64_boot_param->initrd_size;
    2.11   
    2.12      if ( construct_dom0(dom0, dom0_memory_start, dom0_memory_size,