---

yaml --- r: 234176 b: refs/heads/master c: 86b3212 h: refs/heads/master v: v3
git-mirror · Mar 11, 2011 · 3beeb10 · 3beeb10
1 parent 5c7a9b2
commit 3beeb10
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: 2f14ddc3a7146ea4cd5a3d1ecd993f85f2e4f948
+refs/heads/master: 86b32122fd54addc9af01f8b919c65d3f49090a3
diff --git a/trunk/arch/x86/xen/setup.c b/trunk/arch/x86/xen/setup.c
@@ -200,7 +200,8 @@ char * __init xen_memory_setup(void)
 			 * used as potential resource for I/O address (happens
 			 * when 'allocate_resource' is called).
 			 */
-			if (delta && end < 0x100000000UL)
+			if (delta &&
+				(xen_initial_domain() && end < 0x100000000ULL))
 				e820_add_region(end, delta, E820_UNUSABLE);
 		}