diff --git a/[refs] b/[refs]
index 7f7a8793f08d..3c173c16b3cd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d6ed92196f7acdd1052b0828bb1e2f1a7241815
+refs/heads/master: 04add672cf98a788e9e0d753b2ccfa4a3a0caf56
diff --git a/trunk/include/asm-um/pgtable.h b/trunk/include/asm-um/pgtable.h
index 188f72621776..e57ff136ee51 100644
--- a/trunk/include/asm-um/pgtable.h
+++ b/trunk/include/asm-um/pgtable.h
@@ -408,6 +408,15 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
 
 #include <asm-generic/pgtable-nopud.h>
 
+#ifdef CONFIG_HIGHMEM
+/* Clear a kernel PTE and flush it from the TLB */
+#define kpte_clear_flush(ptep, vaddr)					\
+do {									\
+	pte_clear(&init_mm, vaddr, ptep);				\
+	__flush_tlb_one(vaddr);						\
+} while (0)
+#endif
+
 #endif
 #endif