---

yaml --- r: 245260 b: refs/heads/master c: 0f16d0d h: refs/heads/master v: v3
git-mirror · May 12, 2011 · 7d45e77 · 7d45e77
1 parent abf23df
commit 7d45e77
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15bfc094517db2ddf38ca7ed47f3a1c0ad24f7c4
+refs/heads/master: 0f16d0dfcdb5aab97d9e368f008b070b5b3ec6d3
diff --git a/trunk/arch/x86/xen/setup.c b/trunk/arch/x86/xen/setup.c
@@ -227,7 +227,11 @@ char * __init xen_memory_setup(void)
 
 	memcpy(map_raw, map, sizeof(map));
 	e820.nr_map = 0;
+#ifdef CONFIG_X86_32
+	xen_extra_mem_start = mem_end;
+#else
 	xen_extra_mem_start = max((1ULL << 32), mem_end);
+#endif
 	for (i = 0; i < memmap.nr_entries; i++) {
 		unsigned long long end;