[Xen-changelog] [linux-2.6.18-xen] merge with linux-2.6.18-xen.hg

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Alex Williamson <alex.williamson@xxxxxx>
# Date 1209067734 21600
# Node ID 5d938fac27a2f7365f1cc0b28a0dcbe1af95b727
# Parent  ae505684a995b9aa366fffc4d78cebfdf0552ddc
# Parent  81c5a517a42b817378b63ced1420684e9bed1e21
merge with linux-2.6.18-xen.hg
---
 arch/i386/kernel/setup-xen.c   |   27 ++++++++++++++++-----------
 arch/x86_64/kernel/e820-xen.c  |   23 +++++++++++++++++++----
 arch/x86_64/kernel/setup-xen.c |   12 +-----------
 3 files changed, 36 insertions(+), 26 deletions(-)

diff -r ae505684a995 -r 5d938fac27a2 arch/i386/kernel/setup-xen.c
--- a/arch/i386/kernel/setup-xen.c      Tue Apr 15 11:10:27 2008 -0600
+++ b/arch/i386/kernel/setup-xen.c      Thu Apr 24 14:08:54 2008 -0600
@@ -736,6 +736,21 @@ int __init copy_e820_map(struct e820entr
 #endif
                add_memory_region(start, size, type);
        } while (biosmap++,--nr_map);
+
+#ifdef CONFIG_XEN
+       if (is_initial_xendomain()) {
+               struct xen_memory_map memmap;
+
+               memmap.nr_entries = E820MAX;
+               set_xen_guest_handle(memmap.buffer, machine_e820.map);
+
+               if (HYPERVISOR_memory_op(XENMEM_machine_memory_map, &memmap))
+                       BUG();
+               machine_e820.nr_map = memmap.nr_entries;
+       } else
+               machine_e820 = e820;
+#endif
+
        return 0;
 }
 
@@ -1569,18 +1584,8 @@ static void __init register_memory(void)
 static void __init register_memory(void)
 {
 #ifdef CONFIG_XEN
-       if (is_initial_xendomain()) {
-               struct xen_memory_map memmap;
-
-               memmap.nr_entries = E820MAX;
-               set_xen_guest_handle(memmap.buffer, machine_e820.map);
-
-               if (HYPERVISOR_memory_op(XENMEM_machine_memory_map, &memmap))
-                       BUG();
-
-               machine_e820.nr_map = memmap.nr_entries;
+       if (is_initial_xendomain())
                e820_setup_gap(machine_e820.map, machine_e820.nr_map);
-       }
        else
 #endif
                e820_setup_gap(e820.map, e820.nr_map);
diff -r ae505684a995 -r 5d938fac27a2 arch/x86_64/kernel/e820-xen.c
--- a/arch/x86_64/kernel/e820-xen.c     Tue Apr 15 11:10:27 2008 -0600
+++ b/arch/x86_64/kernel/e820-xen.c     Thu Apr 24 14:08:54 2008 -0600
@@ -45,6 +45,10 @@ unsigned long end_user_pfn = MAXMEM>>PAG
 
 extern struct resource code_resource, data_resource;
 
+#ifdef CONFIG_XEN
+extern struct e820map machine_e820;
+#endif
+
 /* Check for some hardcoded bad areas that early boot is not allowed to touch 
*/ 
 static inline int bad_addr(unsigned long *addrp, unsigned long size)
 { 
@@ -109,8 +113,6 @@ int e820_any_mapped(unsigned long start,
        for (i = 0; i < e820.nr_map; i++) { 
                struct e820entry *ei = &e820.map[i]; 
 #else
-       extern struct e820map machine_e820;
-
        if (!is_initial_xendomain())
                return 0;
        for (i = 0; i < machine_e820.nr_map; i++) {
@@ -141,8 +143,6 @@ int __init e820_all_mapped(unsigned long
        for (i = 0; i < e820.nr_map; i++) {
                struct e820entry *ei = &e820.map[i];
 #else
-       extern struct e820map machine_e820;
-
        if (!is_initial_xendomain())
                return 0;
        for (i = 0; i < machine_e820.nr_map; i++) {
@@ -604,6 +604,21 @@ static int __init copy_e820_map(struct e
 
                add_memory_region(start, size, type);
        } while (biosmap++,--nr_map);
+
+#ifdef CONFIG_XEN
+       if (is_initial_xendomain()) {
+               struct xen_memory_map memmap;
+
+               memmap.nr_entries = E820MAX;
+               set_xen_guest_handle(memmap.buffer, machine_e820.map);
+
+               if (HYPERVISOR_memory_op(XENMEM_machine_memory_map, &memmap))
+                       BUG();
+               machine_e820.nr_map = memmap.nr_entries;
+       } else
+               machine_e820 = e820;
+#endif
+
        return 0;
 }
 
diff -r ae505684a995 -r 5d938fac27a2 arch/x86_64/kernel/setup-xen.c
--- a/arch/x86_64/kernel/setup-xen.c    Tue Apr 15 11:10:27 2008 -0600
+++ b/arch/x86_64/kernel/setup-xen.c    Thu Apr 24 14:08:54 2008 -0600
@@ -903,18 +903,8 @@ void __init setup_arch(char **cmdline_p)
         */
        probe_roms();
 #ifdef CONFIG_XEN
-       if (is_initial_xendomain()) {
-               struct xen_memory_map memmap;
-
-               memmap.nr_entries = E820MAX;
-               set_xen_guest_handle(memmap.buffer, machine_e820.map);
-
-               if (HYPERVISOR_memory_op(XENMEM_machine_memory_map, &memmap))
-                       BUG();
-               machine_e820.nr_map = memmap.nr_entries;
-
+       if (is_initial_xendomain())
                e820_reserve_resources(machine_e820.map, machine_e820.nr_map);
-       }
 #else
        e820_reserve_resources(e820.map, e820.nr_map);
 #endif

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