From 4ecc0df8c7e8803be1a4e92d263fdb1df12ab8ba Mon Sep 17 00:00:00 2001
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Tue, 15 Nov 2011 14:49:09 -0800
Subject: [PATCH] --- yaml --- r: 276409 b: refs/heads/master c:
 2cd1c8d4dc7ecca9e9431e2dabe41ae9c7d89e51 h: refs/heads/master i:   276407:
 88956fc021163e6edee594536b906b8dc556d1a5 v: v3

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

diff --git a/[refs] b/[refs]
index 690fa60aad0e..4b20d38aaff9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1b23714cb578c88ea051768bf26b459e1264411
+refs/heads/master: 2cd1c8d4dc7ecca9e9431e2dabe41ae9c7d89e51
diff --git a/trunk/arch/x86/mm/highmem_32.c b/trunk/arch/x86/mm/highmem_32.c
index b49962662101..f4f29b19fac5 100644
--- a/trunk/arch/x86/mm/highmem_32.c
+++ b/trunk/arch/x86/mm/highmem_32.c
@@ -45,6 +45,7 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
 	vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
 	BUG_ON(!pte_none(*(kmap_pte-idx)));
 	set_pte(kmap_pte-idx, mk_pte(page, prot));
+	arch_flush_lazy_mmu_mode();
 
 	return (void *)vaddr;
 }
@@ -88,6 +89,7 @@ void __kunmap_atomic(void *kvaddr)
 		 */
 		kpte_clear_flush(kmap_pte-idx, vaddr);
 		kmap_atomic_idx_pop();
+		arch_flush_lazy_mmu_mode();
 	}
 #ifdef CONFIG_DEBUG_HIGHMEM
 	else {