diff --git a/[refs] b/[refs]
index 5b246412a3a9..2013fc09ce52 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b394eebdd3d436f1796e53b97799554c5aa77431
+refs/heads/master: 17ebba1fe4da4b5d62782be8743e0e8231812af9
diff --git a/trunk/arch/arm/mm/highmem.c b/trunk/arch/arm/mm/highmem.c
index 77b030f5ec09..086816b205b8 100644
--- a/trunk/arch/arm/mm/highmem.c
+++ b/trunk/arch/arm/mm/highmem.c
@@ -48,7 +48,16 @@ void *kmap_atomic(struct page *page, enum km_type type)
 
 	debug_kmap_atomic(type);
 
-	kmap = kmap_high_get(page);
+#ifdef CONFIG_DEBUG_HIGHMEM
+	/*
+	 * There is no cache coherency issue when non VIVT, so force the
+	 * dedicated kmap usage for better debugging purposes in that case.
+	 */
+	if (!cache_is_vivt())
+		kmap = NULL;
+	else
+#endif
+		kmap = kmap_high_get(page);
 	if (kmap)
 		return kmap;