From fc2e26f8240c53032932848d5294fe07f356ac41 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 9 Jul 2008 13:45:33 +0200
Subject: [PATCH] --- yaml --- r: 104451 b: refs/heads/master c:
 b3fe124389f9dd97f0bbd954da2910e286648f0f h: refs/heads/master i:   104449:
 e448a915eed5bb12b44e13610f6b3bf1e220c6df   104447:
 36ecbd682292842230ecb63974d9cd4cffc150ab v: v3

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

diff --git a/[refs] b/[refs]
index f826f2cd8ec6..37e5ab794b1e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c8a4420444801bd9d818f542eb4a5be8d5687f0
+refs/heads/master: b3fe124389f9dd97f0bbd954da2910e286648f0f
diff --git a/trunk/arch/x86/xen/enlighten.c b/trunk/arch/x86/xen/enlighten.c
index 776c0fb77d69..3da6acb7eafc 100644
--- a/trunk/arch/x86/xen/enlighten.c
+++ b/trunk/arch/x86/xen/enlighten.c
@@ -1124,7 +1124,9 @@ static void xen_set_fixmap(unsigned idx, unsigned long phys, pgprot_t prot)
 #ifdef CONFIG_X86_32
 	case FIX_WP_TEST:
 	case FIX_VDSO:
+# ifdef CONFIG_HIGHMEM
 	case FIX_KMAP_BEGIN ... FIX_KMAP_END:
+# endif
 #else
 	case VSYSCALL_LAST_PAGE ... VSYSCALL_FIRST_PAGE:
 #endif