5 files changed, 15 insertions, 13 deletions

diff --git a/arch/mips/mm/c-r3k.c b/arch/mips/mm/c-r3k.c
index bb041a22f20a..e1f35ef81145 100644
--- a/arch/mips/mm/c-r3k.c
+++ b/arch/mips/mm/c-r3k.c
@@ -335,7 +335,7 @@ void __init r3k_cache_init(void)
         flush_cache_mm = r3k_flush_cache_mm;
         flush_cache_range = r3k_flush_cache_range;
         flush_cache_page = r3k_flush_cache_page;
-        flush_icache_page = r3k_flush_icache_page;
+        __flush_icache_page = r3k_flush_icache_page;
         flush_icache_range = r3k_flush_icache_range;
 
         flush_cache_sigtramp = r3k_flush_cache_sigtramp;
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c
index b3ccb8738d29..4e1498246343 100644
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
@@ -1291,7 +1291,7 @@ void __init r4k_cache_init(void)
         __flush_cache_all       = r4k___flush_cache_all;
         flush_cache_mm          = r4k_flush_cache_mm;
         flush_cache_page        = r4k_flush_cache_page;
-        flush_icache_page       = r4k_flush_icache_page;
+        __flush_icache_page     = r4k_flush_icache_page;
         flush_cache_range       = r4k_flush_cache_range;
 
         flush_cache_sigtramp    = r4k_flush_cache_sigtramp;
diff --git a/arch/mips/mm/c-sb1.c b/arch/mips/mm/c-sb1.c
index 2d71efb82ac5..4bd9ad8a5e07 100644
--- a/arch/mips/mm/c-sb1.c
+++ b/arch/mips/mm/c-sb1.c
@@ -520,7 +520,7 @@ void sb1_cache_init(void)
 
         /* These routines are for Icache coherence with the Dcache */
         flush_icache_range = sb1_flush_icache_range;
-        flush_icache_page = sb1_flush_icache_page;
+        __flush_icache_page = sb1_flush_icache_page;
         flush_icache_all = __sb1_flush_icache_all; /* local only */
 
         /* This implies an Icache flush too, so can't be nop'ed */
diff --git a/arch/mips/mm/c-tx39.c b/arch/mips/mm/c-tx39.c
index 5dfc9b1901f6..932a09d7ef84 100644
--- a/arch/mips/mm/c-tx39.c
+++ b/arch/mips/mm/c-tx39.c
@@ -382,7 +382,7 @@ void __init tx39_cache_init(void)
                 flush_cache_mm          = (void *) tx39h_flush_icache_all;
                 flush_cache_range       = (void *) tx39h_flush_icache_all;
                 flush_cache_page        = (void *) tx39h_flush_icache_all;
-                flush_icache_page       = (void *) tx39h_flush_icache_all;
+                __flush_icache_page     = (void *) tx39h_flush_icache_all;
                 flush_icache_range      = (void *) tx39h_flush_icache_all;
 
                 flush_cache_sigtramp    = (void *) tx39h_flush_icache_all;
@@ -408,7 +408,7 @@ void __init tx39_cache_init(void)
                 flush_cache_mm = tx39_flush_cache_mm;
                 flush_cache_range = tx39_flush_cache_range;
                 flush_cache_page = tx39_flush_cache_page;
-                flush_icache_page = tx39_flush_icache_page;
+                __flush_icache_page = tx39_flush_icache_page;
                 flush_icache_range = tx39_flush_icache_range;
 
                 flush_cache_sigtramp = tx39_flush_cache_sigtramp;
diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c
index ddd3a2de1d73..40c8b0235183 100644
--- a/arch/mips/mm/cache.c
+++ b/arch/mips/mm/cache.c
@@ -25,7 +25,7 @@ void (*flush_cache_range)(struct vm_area_struct *vma, unsigned long start,
 void (*flush_cache_page)(struct vm_area_struct *vma, unsigned long page,
         unsigned long pfn);
 void (*flush_icache_range)(unsigned long start, unsigned long end);
-void (*flush_icache_page)(struct vm_area_struct *vma, struct page *page);
+void (*__flush_icache_page)(struct vm_area_struct *vma, struct page *page);
 
 /* MIPS specific cache operations */
 void (*flush_cache_sigtramp)(unsigned long addr);
@@ -70,6 +70,8 @@ void __flush_dcache_page(struct page *page)
         struct address_space *mapping = page_mapping(page);
         unsigned long addr;
 
+        if (PageHighMem(page))
+                return;
         if (mapping && !mapping_mapped(mapping)) {
                 SetPageDcacheDirty(page);
                 return;
@@ -91,16 +93,16 @@ void __update_cache(struct vm_area_struct *vma, unsigned long address,
 {
         struct page *page;
         unsigned long pfn, addr;
+        int exec = (vma->vm_flags & VM_EXEC) && !cpu_has_ic_fills_f_dc;
 
         pfn = pte_pfn(pte);
-        if (pfn_valid(pfn) && (page = pfn_to_page(pfn), page_mapping(page)) &&
-            Page_dcache_dirty(page)) {
-                if (pages_do_alias((unsigned long)page_address(page),
-                                   address & PAGE_MASK)) {
-                        addr = (unsigned long) page_address(page);
+        if (unlikely(!pfn_valid(pfn)))
+                return;
+        page = pfn_to_page(pfn);
+        if (page_mapping(page) && Page_dcache_dirty(page)) {
+                addr = (unsigned long) page_address(page);
+                if (exec || pages_do_alias(addr, address & PAGE_MASK))
                         flush_data_cache_page(addr);
-                }
-
                 ClearPageDcacheDirty(page);
         }
 }