[PATCH] mm: init_mm without ptlock

[linux-2.6-omap-h63xx.git] / arch / i386 / mm / ioremap.c

diff --git a/arch/i386/mm/ioremap.c b/arch/i386/mm/ioremap.c
index f379b8d675585eac6e6884887fc1a1a9b5230624..5d09de8d1c6b17e2048f485aa940f53589ec94e1 100644 (file)
--- a/arch/i386/mm/ioremap.c
+++ b/arch/i386/mm/ioremap.c
@@ -28,7 +28,7 @@ static int ioremap_pte_range(pmd_t *pmd, unsigned long addr,
        unsigned long pfn;
 
        pfn = phys_addr >> PAGE_SHIFT;
-       pte = pte_alloc_kernel(&init_mm, pmd, addr);
+       pte = pte_alloc_kernel(pmd, addr);
        if (!pte)
                return -ENOMEM;
        do {
@@ -87,14 +87,12 @@ static int ioremap_page_range(unsigned long addr,
        flush_cache_all();
        phys_addr -= addr;
        pgd = pgd_offset_k(addr);
-       spin_lock(&init_mm.page_table_lock);
        do {
                next = pgd_addr_end(addr, end);
                err = ioremap_pud_range(pgd, addr, next, phys_addr+addr, flags);
                if (err)
                        break;
        } while (pgd++, addr = next, addr != end);
-       spin_unlock(&init_mm.page_table_lock);
        flush_tlb_all();
        return err;
 }