[Xen-changelog] [xen-unstable] Revert 12361:32f7b40ace426d3acdf26c21c20cb6b4562d9f10.

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

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID 25e6a17e82f09faf7d728e91e612f9ddd47c73cc
# Parent  bff7dde404676fa9545b7ec21c1d71aa37879ffb
Revert 12361:32f7b40ace426d3acdf26c21c20cb6b4562d9f10.
We should support the XENMEM_memory_map hypercall properly
to fix this issue.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 linux-2.6-xen-sparse/arch/x86_64/kernel/e820-xen.c               |    9 
++-------
 linux-2.6-xen-sparse/include/asm-i386/mach-xen/setup_arch_post.h |    8 
+-------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff -r bff7dde40467 -r 25e6a17e82f0 
linux-2.6-xen-sparse/arch/x86_64/kernel/e820-xen.c
--- a/linux-2.6-xen-sparse/arch/x86_64/kernel/e820-xen.c        Fri Nov 10 
14:26:14 2006 +0000
+++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/e820-xen.c        Fri Nov 10 
14:53:00 2006 +0000
@@ -583,20 +583,15 @@ void __init setup_memory_region(void)
         * the boot process we know we have plenty slack space.
         */
        struct e820entry map[E820MAX];
-       unsigned long arg = DOMID_SELF;
 
        memmap.nr_entries = E820MAX;
        set_xen_guest_handle(memmap.buffer, map);
 
        rc = HYPERVISOR_memory_op(XENMEM_memory_map, &memmap);
-       if (rc == -ENOSYS) {
+       if ( rc == -ENOSYS ) {
                memmap.nr_entries = 1;
                map[0].addr = 0ULL;
-               rc = HYPERVISOR_memory_op(XENMEM_maximum_reservation, &arg);
-               if (rc < 0)
-                       map[0].size = xen_start_info->nr_pages << PAGE_SHIFT;
-               else
-                       map[0].size = rc << PAGE_SHIFT;
+               map[0].size = xen_start_info->nr_pages << PAGE_SHIFT;
                /* 8MB slack (to balance backend allocations). */
                map[0].size += 8 << 20;
                map[0].type = E820_RAM;
diff -r bff7dde40467 -r 25e6a17e82f0 
linux-2.6-xen-sparse/include/asm-i386/mach-xen/setup_arch_post.h
--- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/setup_arch_post.h  Fri Nov 
10 14:26:14 2006 +0000
+++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/setup_arch_post.h  Fri Nov 
10 14:53:00 2006 +0000
@@ -13,7 +13,6 @@ static char * __init machine_specific_me
 {
        int rc;
        struct xen_memory_map memmap;
-       unsigned long arg = DOMID_SELF;
        /*
         * This is rather large for a stack variable but this early in
         * the boot process we know we have plenty slack space.
@@ -24,14 +23,9 @@ static char * __init machine_specific_me
        set_xen_guest_handle(memmap.buffer, map);
 
        rc = HYPERVISOR_memory_op(XENMEM_memory_map, &memmap);
-       if (rc == -ENOSYS) {
+       if ( rc == -ENOSYS ) {
                memmap.nr_entries = 1;
                map[0].addr = 0ULL;
-               rc = HYPERVISOR_memory_op(XENMEM_maximum_reservation, &arg);
-               if (rc < 0)
-                       map[0].size = PFN_PHYS(xen_start_info->nr_pages);
-               else
-                       map[0].size = PFN_PHYS(rc);
                map[0].size = PFN_PHYS(xen_start_info->nr_pages);
                /* 8MB slack (to balance backend allocations). */
                map[0].size += 8ULL << 20;

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