vserver 2.0 rc7

[linux-2.6.git] / arch / sparc / mm / generic.c

diff --git a/arch/sparc/mm/generic.c b/arch/sparc/mm/generic.c
index f4c6851..db27eee 100644 (file)
--- a/arch/sparc/mm/generic.c
+++ b/arch/sparc/mm/generic.c
@@ -47,7 +47,7 @@ static inline void forget_pte(pte_t page)
  * They use a pgprot that sets PAGE_IO and does not check the
  * mem_map table as this is independent of normal memory.
  */
-static inline void io_remap_pte_range(pte_t * pte, unsigned long address, unsigned long size,
+static inline void io_remap_pte_range(struct mm_struct *mm, pte_t * pte, unsigned long address, unsigned long size,
        unsigned long offset, pgprot_t prot, int space)
 {
        unsigned long end;
@@ -58,7 +58,7 @@ static inline void io_remap_pte_range(pte_t * pte, unsigned long address, unsign
                end = PMD_SIZE;
        do {
                pte_t oldpage = *pte;
-               pte_clear(pte);
+               pte_clear(mm, address, pte);
                set_pte(pte, mk_pte_io(offset, prot, space));
                forget_pte(oldpage);
                address += PAGE_SIZE;
@@ -67,7 +67,7 @@ static inline void io_remap_pte_range(pte_t * pte, unsigned long address, unsign
        } while (address < end);
 }
 
-static inline int io_remap_pmd_range(pmd_t * pmd, unsigned long address, unsigned long size,
+static inline int io_remap_pmd_range(struct mm_struct *mm, pmd_t * pmd, unsigned long address, unsigned long size,
        unsigned long offset, pgprot_t prot, int space)
 {
        unsigned long end;
@@ -78,10 +78,10 @@ static inline int io_remap_pmd_range(pmd_t * pmd, unsigned long address, unsigne
                end = PGDIR_SIZE;
        offset -= address;
        do {
-               pte_t * pte = pte_alloc_map(current->mm, pmd, address);
+               pte_t * pte = pte_alloc_map(mm, pmd, address);
                if (!pte)
                        return -ENOMEM;
-               io_remap_pte_range(pte, address, end - address, address + offset, prot, space);
+               io_remap_pte_range(mm, pte, address, end - address, address + offset, prot, space);
                address = (address + PMD_SIZE) & PMD_MASK;
                pmd++;
        } while (address < end);
@@ -107,7 +107,41 @@ int io_remap_page_range(struct vm_area_struct *vma, unsigned long from, unsigned
                error = -ENOMEM;
                if (!pmd)
                        break;
-               error = io_remap_pmd_range(pmd, from, end - from, offset + from, prot, space);
+               error = io_remap_pmd_range(mm, pmd, from, end - from, offset + from, prot, space);
+               if (error)
+                       break;
+               from = (from + PGDIR_SIZE) & PGDIR_MASK;
+               dir++;
+       }
+       spin_unlock(&mm->page_table_lock);
+
+       flush_tlb_range(vma, beg, end);
+       return error;
+}
+
+int io_remap_pfn_range(struct vm_area_struct *vma, unsigned long from,
+                       unsigned long pfn, unsigned long size, pgprot_t prot)
+{
+       int error = 0;
+       pgd_t * dir;
+       unsigned long beg = from;
+       unsigned long end = from + size;
+       struct mm_struct *mm = vma->vm_mm;
+       int space = GET_IOSPACE(pfn);
+       unsigned long offset = GET_PFN(pfn) << PAGE_SHIFT;
+
+       prot = __pgprot(pg_iobits);
+       offset -= from;
+       dir = pgd_offset(mm, from);
+       flush_cache_range(vma, beg, end);
+
+       spin_lock(&mm->page_table_lock);
+       while (from < end) {
+               pmd_t *pmd = pmd_alloc(current->mm, dir, from);
+               error = -ENOMEM;
+               if (!pmd)
+                       break;
+               error = io_remap_pmd_range(mm, pmd, from, end - from, offset + from, prot, space);
                if (error)
                        break;
                from = (from + PGDIR_SIZE) & PGDIR_MASK;