2.6.9-rc3-bk1

 mm

diff -Nru a/mm/mmap.c b/mm/mmap.c
--- a/mm/mmap.c   2004-09-03 02:08:17 -07:00
+++ b/mm/mmap.c   2004-09-30 06:35:27 -07:00
@@ -54,7 +54,7 @@
    __S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111
 };
 
-int sysctl_overcommit_memory = 0;   /* default is heuristic overcommit */
+int sysctl_overcommit_memory = OVERCOMMIT_GUESS;  /* heuristic overcommit */
 int sysctl_overcommit_ratio = 50;   /* default is 50% */
 int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
 atomic_t vm_committed_space = ATOMIC_INIT(0);
@@ -907,7 +907,7 @@
       return -ENOMEM;
 
    if (accountable && (!(flags & MAP_NORESERVE) ||
-         sysctl_overcommit_memory > 1)) {
+             sysctl_overcommit_memory == OVERCOMMIT_NEVER)) {
       if (vm_flags & VM_SHARED) {
          /* Check memory availability in shmem_file_setup? */
          vm_flags |= VM_ACCOUNT;