2 files changed, 6 insertions, 0 deletions

diff --git a/arch/arm/mm/fault-armv.c b/arch/arm/mm/fault-armv.c
index 44558d5f9313..fbfa26058442 100644
--- a/arch/arm/mm/fault-armv.c
+++ b/arch/arm/mm/fault-armv.c
@@ -144,13 +144,17 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long addr, pte_t pte)
         page = pfn_to_page(pfn);
         mapping = page_mapping(page);
         if (mapping) {
+#ifndef CONFIG_SMP
                 int dirty = test_and_clear_bit(PG_dcache_dirty, &page->flags);
 
                 if (dirty)
                         __flush_dcache_page(mapping, page);
+#endif
 
                 if (cache_is_vivt())
                         make_coherent(mapping, vma, addr, pfn);
+                else if (vma->vm_flags & VM_EXEC)
+                        __flush_icache_all();
         }
 }
 
diff --git a/arch/arm/mm/flush.c b/arch/arm/mm/flush.c
index 9df507d36e0b..029ee65fda2b 100644
--- a/arch/arm/mm/flush.c
+++ b/arch/arm/mm/flush.c
@@ -199,6 +199,8 @@ void flush_dcache_page(struct page *page)
                 __flush_dcache_page(mapping, page);
                 if (mapping && cache_is_vivt())
                         __flush_dcache_aliases(mapping, page);
+                else if (mapping)
+                        __flush_icache_all();
         }
 }
 EXPORT_SYMBOL(flush_dcache_page);