---

yaml --- r: 217853 b: refs/heads/master c: b5b43ce h: refs/heads/master i: 217851: 797fba6 v: v3
git-mirror · Oct 22, 2010 · a165417 · a165417
1 parent cf8874a
commit a165417
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36bc251b87f88147e9d8346e4b431f42353c3d38
+refs/heads/master: b5b43ced7a6e79d30df3232b37dc82c5d8dfa843
diff --git a/trunk/arch/x86/xen/setup.c b/trunk/arch/x86/xen/setup.c
@@ -158,9 +158,8 @@ char * __init xen_memory_setup(void)
 	xen_extra_mem_start = mem_end;
 	for (i = 0; i < memmap.nr_entries; i++) {
 		unsigned long long end = map[i].addr + map[i].size;
+
 		if (map[i].type == E820_RAM) {
-			if (map[i].addr > mem_end)
-				continue;
 			if (end > mem_end) {
 				/* Truncate region to max_mem. */
 				map[i].size -= end - mem_end;
@@ -169,7 +168,9 @@ char * __init xen_memory_setup(void)
 			}
 		} else if (map[i].type != E820_RAM)
 			xen_extra_mem_start = end;
-		if (map[i].size > 0)
+
+		if ((map[i].type != E820_RAM || map[i].addr < mem_end) &&
+		    map[i].size > 0)
 			e820_add_region(map[i].addr, map[i].size, map[i].type);
 	}