diff --git a/[refs] b/[refs]
index c3a7bff4727a..48ce8bdc8f6e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b8a9da525c592f129ace454c4d82a80b122827a
+refs/heads/master: c40504e87e28c52258458a53fefcd63f58e11a42
diff --git a/trunk/include/asm-um/mmu_context.h b/trunk/include/asm-um/mmu_context.h
index 7529c9c853dd..095bb627b96a 100644
--- a/trunk/include/asm-um/mmu_context.h
+++ b/trunk/include/asm-um/mmu_context.h
@@ -16,8 +16,12 @@
 
 #define deactivate_mm(tsk,mm)	do { } while (0)
 
+extern void force_flush_all(void);
+
 static inline void activate_mm(struct mm_struct *old, struct mm_struct *new)
 {
+	if (old != new)
+		force_flush_all();
 }
 
 static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,