patch-2.6.6-vs1.9.0

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

diff --git a/mm/swapfile.c b/mm/swapfile.c
index 9ca222b..321b09c 100644 (file)
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -459,7 +459,8 @@ static void
 unuse_pte(struct vm_area_struct *vma, unsigned long address, pte_t *dir,
        swp_entry_t entry, struct page *page, struct pte_chain **pte_chainp)
 {
-       vma->vm_mm->rss++;
+       // vma->vm_mm->rss++;
+       vx_rsspages_inc(vma->vm_mm);
        get_page(page);
        set_pte(dir, pte_mkold(mk_pte(page, vma->vm_page_prot)));
        *pte_chainp = page_add_rmap(page, dir, *pte_chainp);
@@ -1595,6 +1596,8 @@ void si_swapinfo(struct sysinfo *val)
        val->freeswap = nr_swap_pages + nr_to_be_unused;
        val->totalswap = total_swap_pages + nr_to_be_unused;
        swap_list_unlock();
+        if (vx_flags(VXF_VIRT_MEM, 0))
+                vx_vsi_swapinfo(val);
 }
 
 /*