mm: factor commit limit calculation

The same calculation is currently done in three differents places.
Factor that code so future changes has to be made at only one place.

[akpm@linux-foundation.org: uninline vm_commit_limit()]
Signed-off-by: Jerome Marchand <jmarchan@redhat.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Michal Hocko <mhocko@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 1 insertions, 2 deletions

diff --git a/mm/nommu.c b/mm/nommu.c
index ecd1f158548e..d8a957bb9e31 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -1948,13 +1948,12 @@ int __vm_enough_memory(struct mm_struct *mm, long pages, int cap_sys_admin)
                 goto error;
         }
 
-        allowed = totalram_pages * sysctl_overcommit_ratio / 100;
+        allowed = vm_commit_limit();
         /*
          * Reserve some 3% for root
          */
         if (!cap_sys_admin)
                 allowed -= sysctl_admin_reserve_kbytes >> (PAGE_SHIFT - 10);
-        allowed += total_swap_pages;
 
         /*
          * Don't let a single process grow so big a user can't recover