From 6ebd2d8a58a862175d3a009b5ce9c80884a94b18 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Date: Sat, 7 Mar 2009 23:48:41 -0800
Subject: [PATCH] --- yaml --- r: 145849 b: refs/heads/master c:
 e7c064889606aab3569669078c69b87b2c527e72 h: refs/heads/master i:   145847:
 57b9c9c8853a6e12e85a459e5aa1d31da24f0786 v: v3

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

diff --git a/[refs] b/[refs]
index 3e017f887552..0ca412c4937d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 169aafbc8d3f05431b5cfeb60294a12b8ef2bcee
+refs/heads/master: e7c064889606aab3569669078c69b87b2c527e72
diff --git a/trunk/arch/x86/xen/mmu.c b/trunk/arch/x86/xen/mmu.c
index 77b242c9a11e..a96f5b9393ea 100644
--- a/trunk/arch/x86/xen/mmu.c
+++ b/trunk/arch/x86/xen/mmu.c
@@ -1812,6 +1812,9 @@ static void xen_set_fixmap(unsigned idx, unsigned long phys, pgprot_t prot)
 #ifdef CONFIG_X86_LOCAL_APIC
 	case FIX_APIC_BASE:	/* maps dummy local APIC */
 #endif
+	case FIX_TEXT_POKE0:
+	case FIX_TEXT_POKE1:
+		/* All local page mappings */
 		pte = pfn_pte(phys, prot);
 		break;