X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=mm%2Fmmap.c;h=6d65c315e6af1edf57881fb0a4b2a66b7366f961;hb=7f9d9341459b8bd167e9d0d54427a31bb1ee448a;hp=fa5cb89348bad2b034e3f2f9d82cac8e06390018;hpb=83e32fc6d7aa9fb584b6fe9855e7d503667020c5;p=firefly-linux-kernel-4.4.55.git

diff --git a/mm/mmap.c b/mm/mmap.c
index fa5cb89348ba..6d65c315e6af 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -127,7 +127,7 @@ EXPORT_SYMBOL_GPL(vm_memory_committed);
  */
 int __vm_enough_memory(struct mm_struct *mm, long pages, int cap_sys_admin)
 {
-	unsigned long free, allowed, reserve;
+	long free, allowed, reserve;
 
 	vm_acct_memory(pages);
 
@@ -193,7 +193,7 @@ int __vm_enough_memory(struct mm_struct *mm, long pages, int cap_sys_admin)
 	 */
 	if (mm) {
 		reserve = sysctl_user_reserve_kbytes >> (PAGE_SHIFT - 10);
-		allowed -= min(mm->total_vm / 32, reserve);
+		allowed -= min_t(long, mm->total_vm / 32, reserve);
 	}
 
 	if (percpu_counter_read_positive(&vm_committed_as) < allowed)