# HG changeset patch
# User yamahata@xxxxxxxxxxxxx
# Node ID 418d5850bd6fd51fa26c3e581d23b7c3a0bfcc37
# Parent  5fcc346d6fe086436977a9b171f2bdb3a177d828
take start_info page from dom0 page not from xen heap.
start_info page is used for xen to pass start up information
to domain0 and the page is used only by dom0 so that it should
belong to dom0.

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>

diff -r 5fcc346d6fe0 -r 418d5850bd6f linux-2.6-xen-sparse/arch/ia64/kernel/setup.c
--- a/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c	Thu Jan 26 11:31:28 2006 +0100
+++ b/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c	Fri Feb  3 16:45:07 2006 +0900
@@ -56,6 +56,9 @@
 #include <asm/smp.h>
 #include <asm/system.h>
 #include <asm/unistd.h>
+#ifdef CONFIG_XEN
+#include <asm/hypervisor.h>
+#endif
 
 #if defined(CONFIG_SMP) && (IA64_CPU_SIZE > PAGE_SIZE)
 # error "struct cpuinfo_ia64 too big!"
@@ -190,6 +193,12 @@
 	rsvd_region[n].start = (unsigned long) ia64_imva((void *)KERNEL_START);
 	rsvd_region[n].end   = (unsigned long) ia64_imva(_end);
 	n++;
+
+#ifdef CONFIG_XEN
+	rsvd_region[n].start = (unsigned long) (HYPERVISOR_shared_info->arch.start_info_pfn << PAGE_SHIFT);
+	rsvd_region[n].end   = rsvd_region[n].start + PAGE_SIZE;
+	n++;
+#endif
 
 #ifdef CONFIG_BLK_DEV_INITRD
 	if (ia64_boot_param->initrd_start) {
diff -r 5fcc346d6fe0 -r 418d5850bd6f xen/arch/ia64/xen/domain.c
--- a/xen/arch/ia64/xen/domain.c	Thu Jan 26 11:31:28 2006 +0100
+++ b/xen/arch/ia64/xen/domain.c	Fri Feb  3 16:45:07 2006 +0900
@@ -788,6 +788,7 @@
 	unsigned long pkern_entry;
 	unsigned long pkern_end;
 	unsigned long pinitrd_start = 0;
+	unsigned long pstart_info;
 	unsigned long ret, progress = 0;
 
 //printf("construct_dom0: starting\n");
@@ -847,13 +848,18 @@
                           (PAGE_ALIGN(initrd_len) + 4*1024*1024);
 
              memcpy(__va(pinitrd_start),initrd_start,initrd_len);
+             pstart_info = PAGE_ALIGN(pinitrd_start + initrd_len);
+        } else {
+             pstart_info = PAGE_ALIGN(pkern_end);
         }
 
 	printk("METAPHYSICAL MEMORY ARRANGEMENT:\n"
 	       " Kernel image:  %lx->%lx\n"
 	       " Entry address: %lx\n"
-               " Init. ramdisk: %lx len %lx\n",
-               pkern_start, pkern_end, pkern_entry, pinitrd_start, initrd_len);
+	       " Init. ramdisk: %lx len %lx\n"
+	       " Start info.:   %lx->%lx\n",
+	       pkern_start, pkern_end, pkern_entry, pinitrd_start, initrd_len,
+	       pstart_info, pstart_info + PAGE_SIZE);
 
 	if ( (pkern_end - pkern_start) > (d->max_pages * PAGE_SIZE) )
 	{
@@ -908,9 +914,9 @@
 
 
 	/* Set up start info area. */
-	si = (start_info_t *)alloc_xenheap_page();
+	d->shared_info->arch.start_info_pfn = pstart_info >> PAGE_SHIFT;
+	si = __va(pstart_info);
 	memset(si, 0, PAGE_SIZE);
-	d->shared_info->arch.start_info_pfn = __pa(si) >> PAGE_SHIFT;
 	sprintf(si->magic, "xen-%i.%i-ia64", XEN_VERSION, XEN_SUBVERSION);
 	si->nr_pages     = d->tot_pages;