vserver 2.0-rc4

[linux-2.6.git] / mm / fremap.c

diff --git a/mm/fremap.c b/mm/fremap.c
index 2f211f5..08f0394 100644 (file)
--- a/mm/fremap.c
+++ b/mm/fremap.c
@@ -14,6 +14,7 @@
 #include <linux/swapops.h>
 #include <linux/rmap.h>
 #include <linux/module.h>
+#include <linux/syscalls.h>
 #include <linux/vs_memory.h>
 
 #include <asm/mmu_context.h>
@@ -39,7 +40,6 @@ static inline void zap_pte(struct mm_struct *mm, struct vm_area_struct *vma,
                                        set_page_dirty(page);
                                page_remove_rmap(page);
                                page_cache_release(page);
-                               // mm->rss--;
                                vx_rsspages_dec(mm);
                        }
                }
@@ -61,8 +61,9 @@ int install_page(struct mm_struct *mm, struct vm_area_struct *vma,
        pgoff_t size;
        int err = -ENOMEM;
        pte_t *pte;
-       pgd_t *pgd;
        pmd_t *pmd;
+       pud_t *pud;
+       pgd_t *pgd;
        pte_t pte_val;
 
        pgd = pgd_offset(mm, addr);
@@ -70,8 +71,12 @@ int install_page(struct mm_struct *mm, struct vm_area_struct *vma,
 
        if (!vx_rsspages_avail(mm, 1))
                goto err_unlock;
+       
+       pud = pud_alloc(mm, pgd, addr);
+       if (!pud)
+               goto err_unlock;
 
-       pmd = pmd_alloc(mm, pgd, addr);
+       pmd = pmd_alloc(mm, pud, addr);
        if (!pmd)
                goto err_unlock;
 
@@ -91,7 +96,6 @@ int install_page(struct mm_struct *mm, struct vm_area_struct *vma,
 
        zap_pte(mm, vma, addr, pte);
 
-       // mm->rss++;
        vx_rsspages_inc(mm);
        flush_icache_page(vma, page);
        set_pte(pte, mk_pte(page, prot));
@@ -117,14 +121,19 @@ int install_file_pte(struct mm_struct *mm, struct vm_area_struct *vma,
 {
        int err = -ENOMEM;
        pte_t *pte;
-       pgd_t *pgd;
        pmd_t *pmd;
+       pud_t *pud;
+       pgd_t *pgd;
        pte_t pte_val;
 
        pgd = pgd_offset(mm, addr);
        spin_lock(&mm->page_table_lock);
+       
+       pud = pud_alloc(mm, pgd, addr);
+       if (!pud)
+               goto err_unlock;
 
-       pmd = pmd_alloc(mm, pgd, addr);
+       pmd = pmd_alloc(mm, pud, addr);
        if (!pmd)
                goto err_unlock;
 
@@ -226,9 +235,7 @@ asmlinkage long sys_remap_file_pages(unsigned long start, unsigned long size,
                        flush_dcache_mmap_lock(mapping);
                        vma->vm_flags |= VM_NONLINEAR;
                        vma_prio_tree_remove(vma, &mapping->i_mmap);
-                       vma_prio_tree_init(vma);
-                       list_add_tail(&vma->shared.vm_set.list,
-                                       &mapping->i_mmap_nonlinear);
+                       vma_nonlinear_insert(vma, &mapping->i_mmap_nonlinear);
                        flush_dcache_mmap_unlock(mapping);
                        spin_unlock(&mapping->i_mmap_lock);
                }