WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] [IA64] fix initrd start

# HG changeset patch
# User awilliam@xxxxxxxxxxx
# Node ID da5a42b7d719dcb9246f6aef08f89c65cd837b6b
# Parent  cd1df13fb1c4f6d18a13ca806dea67bd90189c29
[IA64] fix initrd start

Fix initrd start to work with P2M/VP

Signed-off-by: Akio Takebe <takebe_akio@xxxxxxxxxxxxxx>
---
 xen/arch/ia64/xen/dom_fw.c   |    3 ++-
 xen/arch/ia64/xen/xensetup.c |    3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff -r cd1df13fb1c4 -r da5a42b7d719 xen/arch/ia64/xen/dom_fw.c
--- a/xen/arch/ia64/xen/dom_fw.c        Mon May 08 12:56:57 2006 -0600
+++ b/xen/arch/ia64/xen/dom_fw.c        Mon May 08 13:05:47 2006 -0600
@@ -1019,7 +1019,8 @@ dom_fw_init (struct domain *d, const cha
        if (d == dom0) {
                // XXX CONFIG_XEN_IA64_DOM0_VP
                // initrd_start address is hard coded in start_kernel()
-               bp->initrd_start = ia64_boot_param->initrd_start;
+               bp->initrd_start = (dom0_start+dom0_size) -
+                 (PAGE_ALIGN(ia64_boot_param->initrd_size) + 4*1024*1024);
                bp->initrd_size = ia64_boot_param->initrd_size;
        }
        else {
diff -r cd1df13fb1c4 -r da5a42b7d719 xen/arch/ia64/xen/xensetup.c
--- a/xen/arch/ia64/xen/xensetup.c      Mon May 08 12:56:57 2006 -0600
+++ b/xen/arch/ia64/xen/xensetup.c      Mon May 08 13:05:47 2006 -0600
@@ -415,8 +415,7 @@ printk("About to call domain_create()\n"
     printk("About to call construct_dom0()\n");
     dom0_memory_start = (unsigned long) __va(initial_images_start);
     dom0_memory_size = ia64_boot_param->domain_size;
-    dom0_initrd_start = (unsigned long) __va(initial_images_start +
-                            PAGE_ALIGN(ia64_boot_param->domain_size));
+    dom0_initrd_start = (unsigned long) __va(ia64_boot_param->initrd_start);
     dom0_initrd_size = ia64_boot_param->initrd_size;
  
     if ( construct_dom0(dom0, dom0_memory_start, dom0_memory_size,

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [IA64] fix initrd start, Xen patchbot-unstable <=