3 files changed, 7 insertions, 11 deletions

diff --git a/arch/arm/mm/copypage-v4mc.c b/arch/arm/mm/copypage-v4mc.c
index bdb5fd983b15..1601698b9800 100644
--- a/arch/arm/mm/copypage-v4mc.c
+++ b/arch/arm/mm/copypage-v4mc.c
@@ -68,7 +68,7 @@ mc_copy_user_page(void *from, void *to)
         : "r" (from), "r" (to), "I" (PAGE_SIZE / 64));
 }
 
-void v4_mc_copy_user_highpage(struct page *from, struct page *to,
+void v4_mc_copy_user_highpage(struct page *to, struct page *from,
         unsigned long vaddr)
 {
         void *kto = kmap_atomic(to, KM_USER1);
diff --git a/arch/arm/mm/fault-armv.c b/arch/arm/mm/fault-armv.c
index 81d0b8772de3..bc0099d5ae85 100644
--- a/arch/arm/mm/fault-armv.c
+++ b/arch/arm/mm/fault-armv.c
@@ -66,7 +66,10 @@ static int adjust_pte(struct vm_area_struct *vma, unsigned long address)
          * fault (ie, is old), we can safely ignore any issues.
          */
         if (ret && (pte_val(entry) & L_PTE_MT_MASK) != shared_pte_mask) {
-                flush_cache_page(vma, address, pte_pfn(entry));
+                unsigned long pfn = pte_pfn(entry);
+                flush_cache_page(vma, address, pfn);
+                outer_flush_range((pfn << PAGE_SHIFT),
+                                  (pfn << PAGE_SHIFT) + PAGE_SIZE);
                 pte_val(entry) &= ~L_PTE_MT_MASK;
                 pte_val(entry) |= shared_pte_mask;
                 set_pte_at(vma->vm_mm, address, pte, entry);
diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
index 18373f73f2fc..9f88dd3be601 100644
--- a/arch/arm/mm/ioremap.c
+++ b/arch/arm/mm/ioremap.c
@@ -138,7 +138,7 @@ void __check_kvm_seq(struct mm_struct *mm)
  */
 static void unmap_area_sections(unsigned long virt, unsigned long size)
 {
-        unsigned long addr = virt, end = virt + (size & ~SZ_1M);
+        unsigned long addr = virt, end = virt + (size & ~(SZ_1M - 1));
         pgd_t *pgd;
 
         flush_cache_vunmap(addr, end);
@@ -337,10 +337,7 @@ void __iounmap(volatile void __iomem *io_addr)
         void *addr = (void *)(PAGE_MASK & (unsigned long)io_addr);
 #ifndef CONFIG_SMP
         struct vm_struct **p, *tmp;
-#endif
-        unsigned int section_mapping = 0;
 
-#ifndef CONFIG_SMP
         /*
          * If this is a section based mapping we need to handle it
          * specially as the VM subsystem does not know how to handle
@@ -352,11 +349,8 @@ void __iounmap(volatile void __iomem *io_addr)
         for (p = &vmlist ; (tmp = *p) ; p = &tmp->next) {
                 if ((tmp->flags & VM_IOREMAP) && (tmp->addr == addr)) {
                         if (tmp->flags & VM_ARM_SECTION_MAPPING) {
-                                *p = tmp->next;
                                 unmap_area_sections((unsigned long)tmp->addr,
                                                     tmp->size);
-                                kfree(tmp);
-                                section_mapping = 1;
                         }
                         break;
                 }
@@ -364,7 +358,6 @@ void __iounmap(volatile void __iomem *io_addr)
         write_unlock(&vmlist_lock);
 #endif
 
-        if (!section_mapping)
-                vunmap(addr);
+        vunmap(addr);
 }
 EXPORT_SYMBOL(__iounmap);