diff --git a/[refs] b/[refs]
index a1939b42d5f4..55db2e93ab68 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74588d8ba34ff1bda027cfa737972af01ab00c8b
+refs/heads/master: db71daabad0821996483dfe309c4bc81d6755a70
diff --git a/trunk/lib/ioremap.c b/trunk/lib/ioremap.c
index 29c810ec9813..99fa277f9f7b 100644
--- a/trunk/lib/ioremap.c
+++ b/trunk/lib/ioremap.c
@@ -76,8 +76,6 @@ int ioremap_page_range(unsigned long addr,
 
 	BUG_ON(addr >= end);
 
-	flush_cache_all();
-
 	start = addr;
 	phys_addr -= addr;
 	pgd = pgd_offset_k(addr);
@@ -88,7 +86,7 @@ int ioremap_page_range(unsigned long addr,
 			break;
 	} while (pgd++, addr = next, addr != end);
 
-	flush_tlb_all();
+	flush_cache_vmap(start, end);
 
 	return err;
 }