diff --git a/[refs] b/[refs]
index 6f050a657b0b..6de3d3d887b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 225f7e1eb56ad054c328ae1b11601ea4de7488ba
+refs/heads/master: 3d9b7a5ce534f3963afcf8f4777267e5899fe007
diff --git a/trunk/include/asm-blackfin/mmu_context.h b/trunk/include/asm-blackfin/mmu_context.h
index f55ec3c23a92..8529552a981f 100644
--- a/trunk/include/asm-blackfin/mmu_context.h
+++ b/trunk/include/asm-blackfin/mmu_context.h
@@ -173,8 +173,10 @@ static inline void protect_page(struct mm_struct *mm, unsigned long addr,
 
 static inline void update_protections(struct mm_struct *mm)
 {
-	flush_switched_cplbs();
-	set_mask_dcplbs(mm->context.page_rwx_mask);
+	if (mm->context.page_rwx_mask == current_rwx_mask) {
+		flush_switched_cplbs();
+		set_mask_dcplbs(mm->context.page_rwx_mask);
+	}
 }
 #endif