[PATCH] vmacct3/9 mremap MAP_NORESERVE not in flags

[Hugh Dickins]

There is no point in do_mremap clearing MAP_NORESERVE from its flags:
it has already validated that only the MREMAP_ flags can be set,
and it has no use for MAP_NORESERVE in the code that follows anyway.

--- vmacct2/mm/mremap.c	Mon Jul 29 11:48:04 2002
+++ vmacct3/mm/mremap.c	Mon Jul 29 19:23:46 2002
@@ -229,8 +229,6 @@
 	return -ENOMEM;
 }
 
-extern int sysctl_overcommit_memory;	/* FIXME!! */
-
 /*
  * Expand (or shrink) an existing mapping, potentially moving it at the
  * same time (controlled by the MREMAP_MAYMOVE flag and available VM space)
@@ -315,8 +313,6 @@
 	    > current->rlim[RLIMIT_AS].rlim_cur)
 		goto out;
 
-	if (sysctl_overcommit_memory > 1)
-		flags &= ~MAP_NORESERVE;
 	if (vma->vm_flags & VM_ACCOUNT) {
 		charged = (new_len - old_len) >> PAGE_SHIFT;
 		if (!vm_enough_memory(charged))