From ffee5c6ed2bc440466c4bfa8586f5ae787ebc546 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Wed, 2 Apr 2008 10:54:12 -0700
Subject: [PATCH] --- yaml --- r: 93185 b: refs/heads/master c:
 af7ae3b9c4a4c1337903f31131d58e3c0d2b6d55 h: refs/heads/master i:   93183:
 d5d762b38cf41fdcfd2545b89476b494da45c3a1 v: v3

---
 [refs]                         | 2 +-
 trunk/arch/x86/xen/Kconfig     | 2 +-
 trunk/arch/x86/xen/enlighten.c | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 011c584a147d..871e98492b81 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b77797fb2bf31bf076e6b69736119bc6a077525b
+refs/heads/master: af7ae3b9c4a4c1337903f31131d58e3c0d2b6d55
diff --git a/trunk/arch/x86/xen/Kconfig b/trunk/arch/x86/xen/Kconfig
index 4d5f2649bee4..2e641be2737e 100644
--- a/trunk/arch/x86/xen/Kconfig
+++ b/trunk/arch/x86/xen/Kconfig
@@ -6,7 +6,7 @@ config XEN
 	bool "Xen guest support"
 	select PARAVIRT
 	depends on X86_32
-	depends on X86_CMPXCHG && X86_TSC && !NEED_MULTIPLE_NODES && !(X86_VISWS || X86_VOYAGER)
+	depends on X86_CMPXCHG && X86_TSC && !(X86_VISWS || X86_VOYAGER)
 	help
 	  This is the Linux Xen port.  Enabling this will allow the
 	  kernel to boot in a paravirtualized environment under the
diff --git a/trunk/arch/x86/xen/enlighten.c b/trunk/arch/x86/xen/enlighten.c
index bc129146f99f..c8a56e457d61 100644
--- a/trunk/arch/x86/xen/enlighten.c
+++ b/trunk/arch/x86/xen/enlighten.c
@@ -669,7 +669,9 @@ static void xen_write_cr3(unsigned long cr3)
    everything is pinned. */
 static __init void xen_alloc_pte_init(struct mm_struct *mm, u32 pfn)
 {
+#ifdef CONFIG_FLATMEM
 	BUG_ON(mem_map);	/* should only be used early */
+#endif
 	make_lowmem_page_readonly(__va(PFN_PHYS(pfn)));
 }