Fixed vserver memory accounting bug. Between v1.8 and v1.9, a call to vx_rsspages_in...

diff --git a/mm/memory.c b/mm/memory.c
index 6c44ecc..0dfb740 100644 (file)
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1650,8 +1650,9 @@ retry:
         */
        /* Only go through if we didn't race with anybody else... */
        if (pte_none(*page_table)) {
-               if (!PageReserved(new_page))
-                       ++mm->rss;
+               if (!PageReserved(new_page)) 
+                       //++mm->rss;
+                       vx_rsspages_inc(mm);
                flush_icache_page(vma, new_page);
                entry = mk_pte(new_page, vma->vm_page_prot);
                if (write_access)