diff options
Diffstat (limited to 'mm/nommu.c')
-rw-r--r-- | mm/nommu.c | 3 |
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) | |||
1948 | goto error; | 1948 | goto error; |
1949 | } | 1949 | } |
1950 | 1950 | ||
1951 | allowed = totalram_pages * sysctl_overcommit_ratio / 100; | 1951 | allowed = vm_commit_limit(); |
1952 | /* | 1952 | /* |
1953 | * Reserve some 3% for root | 1953 | * Reserve some 3% for root |
1954 | */ | 1954 | */ |
1955 | if (!cap_sys_admin) | 1955 | if (!cap_sys_admin) |
1956 | allowed -= sysctl_admin_reserve_kbytes >> (PAGE_SHIFT - 10); | 1956 | allowed -= sysctl_admin_reserve_kbytes >> (PAGE_SHIFT - 10); |
1957 | allowed += total_swap_pages; | ||
1958 | 1957 | ||
1959 | /* | 1958 | /* |
1960 | * Don't let a single process grow so big a user can't recover | 1959 | * Don't let a single process grow so big a user can't recover |