1 files changed, 7 insertions, 86 deletions

diff --git a/arch/m32r/mm/ioremap.c b/arch/m32r/mm/ioremap.c
index a151849a605e..5152c4e6ac80 100644
--- a/arch/m32r/mm/ioremap.c
+++ b/arch/m32r/mm/ioremap.c
@@ -20,92 +20,8 @@
 #include <asm/byteorder.h>
 
 #include <linux/vmalloc.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <asm/pgalloc.h>
-#include <asm/cacheflush.h>
-#include <asm/tlbflush.h>
-
-static inline void
-remap_area_pte(pte_t * pte, unsigned long address, unsigned long size,
-               unsigned long phys_addr, unsigned long flags)
-{
-        unsigned long end;
-        unsigned long pfn;
-        pgprot_t pgprot = __pgprot(_PAGE_GLOBAL | _PAGE_PRESENT | _PAGE_READ
-                                   | _PAGE_WRITE | flags);
-
-        address &= ~PMD_MASK;
-        end = address + size;
-        if (end > PMD_SIZE)
-                end = PMD_SIZE;
-        if (address >= end)
-                BUG();
-        pfn = phys_addr >> PAGE_SHIFT;
-        do {
-                if (!pte_none(*pte)) {
-                        printk("remap_area_pte: page already exists\n");
-                        BUG();
-                }
-                set_pte(pte, pfn_pte(pfn, pgprot));
-                address += PAGE_SIZE;
-                pfn++;
-                pte++;
-        } while (address && (address < end));
-}
-
-static inline int
-remap_area_pmd(pmd_t * pmd, unsigned long address, unsigned long size,
-               unsigned long phys_addr, unsigned long flags)
-{
-        unsigned long end;
-
-        address &= ~PGDIR_MASK;
-        end = address + size;
-        if (end > PGDIR_SIZE)
-                end = PGDIR_SIZE;
-        phys_addr -= address;
-        if (address >= end)
-                BUG();
-        do {
-                pte_t * pte = pte_alloc_kernel(pmd, address);
-                if (!pte)
-                        return -ENOMEM;
-                remap_area_pte(pte, address, end - address, address + phys_addr, flags);
-                address = (address + PMD_SIZE) & PMD_MASK;
-                pmd++;
-        } while (address && (address < end));
-        return 0;
-}
-
-static int
-remap_area_pages(unsigned long address, unsigned long phys_addr,
-                 unsigned long size, unsigned long flags)
-{
-        int error;
-        pgd_t * dir;
-        unsigned long end = address + size;
-
-        phys_addr -= address;
-        dir = pgd_offset(&init_mm, address);
-        flush_cache_all();
-        if (address >= end)
-                BUG();
-        do {
-                pmd_t *pmd;
-                pmd = pmd_alloc(&init_mm, dir, address);
-                error = -ENOMEM;
-                if (!pmd)
-                        break;
-                if (remap_area_pmd(pmd, address, end - address,
-                                         phys_addr + address, flags))
-                        break;
-                error = 0;
-                address = (address + PGDIR_SIZE) & PGDIR_MASK;
-                dir++;
-        } while (address && (address < end));
-        flush_tlb_all();
-        return error;
-}
 
 /*
  * Generic mapping function (not visible outside):
@@ -129,6 +45,7 @@ __ioremap(unsigned long phys_addr, unsigned long size, unsigned long flags)
         void __iomem * addr;
         struct vm_struct * area;
         unsigned long offset, last_addr;
+        pgprot_t pgprot;
 
         /* Don't allow wraparound or zero size */
         last_addr = phys_addr + size - 1;
@@ -157,6 +74,9 @@ __ioremap(unsigned long phys_addr, unsigned long size, unsigned long flags)
                                 return NULL;
         }
 
+        pgprot = __pgprot(_PAGE_GLOBAL | _PAGE_PRESENT | _PAGE_READ
+                          | _PAGE_WRITE | flags);
+
         /*
          * Mappings have to be page-aligned
          */
@@ -172,7 +92,8 @@ __ioremap(unsigned long phys_addr, unsigned long size, unsigned long flags)
                 return NULL;
         area->phys_addr = phys_addr;
         addr = (void __iomem *) area->addr;
-        if (remap_area_pages((unsigned long)addr, phys_addr, size, flags)) {
+        if (ioremap_page_range((unsigned long)addr, (unsigned long)addr + size,
+                               phys_addr, pgprot)) {
                 vunmap((void __force *) addr);
                 return NULL;
         }