From a97a39fb1813cf4d2157b71abbba65175d2c9181 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Date: Fri, 20 Feb 2009 23:01:26 -0800
Subject: [PATCH] --- yaml --- r: 145817 b: refs/heads/master c:
 5caecb9432428241d0c641897f07ff4003f1b55f h: refs/heads/master i:   145815:
 1ebc8b6ddf3447f052bfe13de4a01efdba74dccd v: v3

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

diff --git a/[refs] b/[refs]
index f5e659ecd26f..fc474a68c0d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab2f75f0b760d2b0c9a875b669a1b51dce02c85a
+refs/heads/master: 5caecb9432428241d0c641897f07ff4003f1b55f
diff --git a/trunk/arch/x86/xen/mmu.c b/trunk/arch/x86/xen/mmu.c
index 3f2d0fe5e6a8..0e572380413b 100644
--- a/trunk/arch/x86/xen/mmu.c
+++ b/trunk/arch/x86/xen/mmu.c
@@ -1812,8 +1812,10 @@ __init void xen_post_allocator_init(void)
 
 static void xen_leave_lazy_mmu(void)
 {
+	preempt_disable();
 	xen_mc_flush();
 	paravirt_leave_lazy_mmu();
+	preempt_enable();
 }
 
 const struct pv_mmu_ops xen_mmu_ops __initdata = {