From: kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Date: Fri, 9 Jun 2006 15:19:42 +0000 (+0100)
Subject: [LINUX] Simplify /proc/iomem initialisation -- no need to fake a
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15972^2~24
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a51b3e57655a4c5743c0323f1e6f378dbe0f881b;p=xen.git

[LINUX] Simplify /proc/iomem initialisation -- no need to fake a
domU memory map. The main e820 map already terminates at max_pfn.
Signed-off-by: Keir Fraser <keir@xensource.com>
---

diff --git a/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c b/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c
index 7ae42e6d35..0b18078632 100644
--- a/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c
@@ -1459,12 +1459,7 @@ static void __init register_memory(void)
 
 	/* Nothing to do if not running in dom0. */
 	if (!(xen_start_info->flags & SIF_INITDOMAIN)) {
-		struct e820entry domU_e820 = {
-			.addr = 0,
-			.size = max_pfn << PAGE_SHIFT,
-			.type = E820_RAM,
-		};
-		legacy_init_iomem_resources(&domU_e820, 1,
+		legacy_init_iomem_resources(e820.map, e820.nr_map,
 					    &code_resource, &data_resource);
 		return;
 	}
diff --git a/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c
index 05fb99fc33..266516b50e 100644
--- a/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c
+++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c
@@ -919,15 +919,11 @@ void __init setup_arch(char **cmdline_p)
 		BUG_ON(HYPERVISOR_memory_op(XENMEM_machine_memory_map, &memmap));
 
 		e820_reserve_resources(machine_e820, memmap.nr_entries);
-	} else {
-		struct e820entry domU_e820 = {
-			.addr = 0,
-			.size = max_pfn << PAGE_SHIFT,
-			.type = E820_RAM,
-		};
-		e820_reserve_resources(&domU_e820, 1);
-	}
-#elif !defined(CONFIG_XEN)
+	} else if (!(xen_start_info->flags & SIF_INITDOMAIN))
+		e820_reserve_resources(e820.map, e820.nr_map);
+#elif defined(CONFIG_XEN)
+	e820_reserve_resources(e820.map, e820.nr_map);
+#else
 	probe_roms();
 	e820_reserve_resources(e820.map, e820.nr_map);
 #endif