From 7d45e779868028328eb9c3788f04252c436f1698 Mon Sep 17 00:00:00 2001
From: Daniel Kiper <dkiper@net-space.pl>
Date: Wed, 11 May 2011 22:34:38 +0200
Subject: [PATCH] --- yaml --- r: 245260 b: refs/heads/master c:
 0f16d0dfcdb5aab97d9e368f008b070b5b3ec6d3 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/arch/x86/xen/setup.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fc5fe10eb7b7..88bec75f5721 100644
--- 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
index fba4a6cc3a2d..ca6297bd4e3c 100644
--- 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;