Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

[firefly-linux-kernel-4.4.55.git] / lib / ioremap.c

diff --git a/lib/ioremap.c b/lib/ioremap.c
index 29c810ec981379b486157cd94e28f6f9d6687b28..a9e4415b02dcca58a5fbdf4d8c81b9821356c714 100644 (file)
--- a/lib/ioremap.c
+++ b/lib/ioremap.c
@@ -5,7 +5,6 @@
  *
  * (C) Copyright 1995 1996 Linus Torvalds
  */
-#include <linux/io.h>
 #include <linux/vmalloc.h>
 #include <linux/mm.h>
 
@@ -76,8 +75,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 +85,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;
 }