From 468415ed05c5892c3ff8d5cb0aa5235073c9a251 Mon Sep 17 00:00:00 2001
From: Rik van Riel <riel@redhat.com>
Date: Tue, 9 Oct 2012 15:31:59 +0200
Subject: [PATCH] --- yaml --- r: 344775 b: refs/heads/master c:
 8d1acce4537c4e2f5889ed9ba9b8eddb80d99820 h: refs/heads/master i:   344773:
 14a31472f97e0f53158327d0f7d2fd8f99fb7f42   344771:
 161a036f8d035823ea90aed54e410b5960cf6589   344767:
 bcdf5b39cbcfcd68a9f4e8d163650141ddbbaf7a v: v3

---
 [refs]                     | 2 +-
 trunk/mm/pgtable-generic.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6c9663e8fb6b..a359f74f5887 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c3cf556b2f7ab5823195766eddec6f1a43134f5
+refs/heads/master: 8d1acce4537c4e2f5889ed9ba9b8eddb80d99820
diff --git a/trunk/mm/pgtable-generic.c b/trunk/mm/pgtable-generic.c
index d8397da42fe6..0c8323fe6c8f 100644
--- a/trunk/mm/pgtable-generic.c
+++ b/trunk/mm/pgtable-generic.c
@@ -88,7 +88,8 @@ pte_t ptep_clear_flush(struct vm_area_struct *vma, unsigned long address,
 {
 	pte_t pte;
 	pte = ptep_get_and_clear((vma)->vm_mm, address, ptep);
-	flush_tlb_page(vma, address);
+	if (pte_accessible(pte))
+		flush_tlb_page(vma, address);
 	return pte;
 }
 #endif