---

yaml --- r: 217852 b: refs/heads/master c: 36bc251 h: refs/heads/master v: v3
git-mirror · Oct 22, 2010 · cf8874a · cf8874a
1 parent 797fba6
commit cf8874a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42ee1471e9b879479a15debac752314a596c738e
+refs/heads/master: 36bc251b87f88147e9d8346e4b431f42353c3d38
diff --git a/trunk/arch/x86/xen/setup.c b/trunk/arch/x86/xen/setup.c
@@ -167,7 +167,8 @@ char * __init xen_memory_setup(void)
 
 				extra_pages += PFN_DOWN(end - mem_end);
 			}
-		}
+		} else if (map[i].type != E820_RAM)
+			xen_extra_mem_start = end;
 		if (map[i].size > 0)
 			e820_add_region(map[i].addr, map[i].size, map[i].type);
 	}