diff --git a/[refs] b/[refs]
index 8ab3a01caf5c..e42782e0b6c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a5f79e7e65d24d2fa9eb6e6208672571704d337
+refs/heads/master: 7e5e6e9a509c4ed2973a345ec7ffb96577f42e26
diff --git a/trunk/include/asm-arm/mmu_context.h b/trunk/include/asm-arm/mmu_context.h
index 4af9c411c617..57b8def83d41 100644
--- a/trunk/include/asm-arm/mmu_context.h
+++ b/trunk/include/asm-arm/mmu_context.h
@@ -86,7 +86,8 @@ switch_mm(struct mm_struct *prev, struct mm_struct *next,
 		cpu_set(cpu, next->cpu_vm_mask);
 		check_context(next);
 		cpu_switch_mm(next->pgd, next);
-		cpu_clear(cpu, prev->cpu_vm_mask);
+		if (cache_is_vivt())
+			cpu_clear(cpu, prev->cpu_vm_mask);
 	}
 }