[Xen-changelog] [IA64] bug fix reserve_memory()

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User awilliam@xxxxxxxxxxx
# Node ID 17adc9c5984a28e48f91e00e4f43a840742ede30
# Parent  0bd35cce66114a6501064366087129411a59be52
[IA64] bug fix reserve_memory()

reserved_region[].start is of virtual address in identity
mapping. not physical address.

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

diff -r 0bd35cce6611 -r 17adc9c5984a 
linux-2.6-xen-sparse/arch/ia64/kernel/setup.c
--- a/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c     Fri Feb 24 15:41:21 2006
+++ b/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c     Fri Feb 24 15:44:34 2006
@@ -247,9 +247,11 @@
        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++;
+       if (running_on_xen) {
+               rsvd_region[n].start = (unsigned 
long)__va((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
@@ -269,6 +271,7 @@
        n++;
 
        num_rsvd_regions = n;
+       BUG_ON(IA64_MAX_RSVD_REGIONS + 1 < n);
 
        sort_regions(rsvd_region, num_rsvd_regions);
 }
diff -r 0bd35cce6611 -r 17adc9c5984a 
linux-2.6-xen-sparse/include/asm-ia64/meminit.h
--- a/linux-2.6-xen-sparse/include/asm-ia64/meminit.h   Fri Feb 24 15:41:21 2006
+++ b/linux-2.6-xen-sparse/include/asm-ia64/meminit.h   Fri Feb 24 15:44:34 2006
@@ -17,10 +17,15 @@
  *     - command line string
  *     - kernel code & data
  *     - Kernel memory map built from EFI memory map
+ *     - xen start info
  *
  * More could be added if necessary
  */
+#ifndef CONFIG_XEN
 #define IA64_MAX_RSVD_REGIONS 6
+#else
+#define IA64_MAX_RSVD_REGIONS 7
+#endif
 
 struct rsvd_region {
        unsigned long start;    /* virtual address of beginning of element */

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