Skip to contentSkip to conversation

linux/x86: set up machine_e820 in copy_e820_map()

PATCH New Jan Beulich 1 participant 1 message Apr 22, 2008

lore
Share & tools
lore

Jan Beulich

author
#0 lore raw

PATCH 1/1 linux/x86: set up machine_e820 in copy_e820_map()

.. for it to be usable earlier (and also for being placed more logically).

As usual, written and tested on 2.6.25 and made apply to the 2.6.18 tree without further testing.

Signed-off-by Jan Beulich <[email protected]>
arch/i386/kernel/setup-xen.c +16 -10
Index: head-2008-04-02/arch/i386/kernel/setup-xen.c
===================================================================
@@ -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 @@ void __init e820_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);

arch/x86_64/kernel/e820-xen.c +15 -0
Index: head-2008-04-02/arch/x86_64/kernel/e820-xen.c
===================================================================
@@ -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;
 }
arch/x86_64/kernel/setup-xen.c +1 -11
Index: head-2008-04-02/arch/x86_64/kernel/setup-xen.c
===================================================================
@@ -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