From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Sun, 21 Aug 2005 00:19:04 +0000 (+0000)
Subject: - remove old vserver-1.9.0 code
X-Git-Tag: before-fedora-2_6_18-1_2239_FC5-vs2_0_2_2-rc6-merge~99
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b4eb0276693a46cb83064ff01efcd3db957743cd;p=linux-2.6.git

- remove old vserver-1.9.0 code
---

diff --git a/mm/mremap.c b/mm/mremap.c
index 1ff760fb5..b287a5eaf 100644
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -244,7 +244,6 @@ static unsigned long move_vma(struct vm_area_struct *vma,
 			vma->vm_next->vm_flags |= VM_ACCOUNT;
 	}
 
-	vx_vmpages_add(mm, new_len >> PAGE_SHIFT);
 	__vm_stat_account(mm, vma->vm_flags, vma->vm_file, new_len>>PAGE_SHIFT);
 	if (vm_flags & VM_LOCKED) {
 		vx_vmlocked_add(mm, new_len >> PAGE_SHIFT);
@@ -362,10 +361,6 @@ unsigned long do_mremap(unsigned long addr,
 		goto out;
 	}
 
-	/* check context space, maybe only Private writable mapping? */
-	if (!vx_vmpages_avail(current->mm, (new_len - old_len) >> PAGE_SHIFT))
-		goto out;
-
 	if (vma->vm_flags & VM_ACCOUNT) {
 		charged = (new_len - old_len) >> PAGE_SHIFT;
 		if (security_vm_enough_memory(charged))