direct-io.hg

changeset 8479:f218e6ba2653

Missed portion of domU initrd patch
Signed-off-by: <takebe_akio@jp.fujitsu.com>
author djm@kirby.fc.hp.com
date Fri Dec 23 15:14:21 2005 -0600 (2005-12-23)
parents 934470721c46
children 40648452d45f
files xen/arch/ia64/xen/dom_fw.c
line diff
     1.1 --- a/xen/arch/ia64/xen/dom_fw.c	Wed Dec 21 20:18:19 2005 +0100
     1.2 +++ b/xen/arch/ia64/xen/dom_fw.c	Fri Dec 23 15:14:21 2005 -0600
     1.3 @@ -861,12 +861,16 @@ dom_fw_init (struct domain *d, char *arg
     1.4  	bp->console_info.orig_x = 0;
     1.5  	bp->console_info.orig_y = 24;
     1.6  	bp->fpswa = 0;
     1.7 -        bp->initrd_start = (dom0_start+dom0_size) -
     1.8 -                (PAGE_ALIGN(ia64_boot_param->initrd_size) + 4*1024*1024);
     1.9 -        bp->initrd_size = ia64_boot_param->initrd_size;
    1.10 -                printf(" initrd start %0xlx", bp->initrd_start);
    1.11 -                printf(" initrd size %0xlx", bp->initrd_size);
    1.12 -
    1.13 -
    1.14 +	if (d == dom0) {
    1.15 +		bp->initrd_start = (dom0_start+dom0_size) -
    1.16 +		  (PAGE_ALIGN(ia64_boot_param->initrd_size) + 4*1024*1024);
    1.17 +		bp->initrd_size = ia64_boot_param->initrd_size;
    1.18 +	}
    1.19 +	else {
    1.20 +		bp->initrd_start = d->arch.initrd_start;
    1.21 +		bp->initrd_size  = d->arch.initrd_len;
    1.22 +	}
    1.23 +	printf(" initrd start %0xlx", bp->initrd_start);
    1.24 +	printf(" initrd size %0xlx", bp->initrd_size);
    1.25  	return bp;
    1.26  }