From: Andy Bavier <acb@cs.princeton.edu>
Date: Tue, 16 Nov 2004 19:41:55 +0000 (+0000)
Subject: Fixed vserver memory accounting bug.  Between v1.8 and v1.9, a call to vx_rsspages_in... 
X-Git-Tag: before-enable-kexec-patch~14
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=d42890e0c2a3d5f1096acfaca70e3a80658e1876;p=linux-2.6.git

Fixed vserver memory accounting bug.  Between v1.8 and v1.9, a call to vx_rsspages_inc() was lost; restored now.
---

diff --git a/mm/memory.c b/mm/memory.c
index 6c44ecca0..0dfb74060 100644
--- 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)