From: Chen Gang <gang.chen.5i5j@gmail.com>
Date: Thu, 14 Jan 2016 23:18:27 +0000 (-0800)
Subject: mm/mmap.c: remove redundant local variables for may_expand_vm()
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0b57d6ba0bd11a41a791cf6c5bbf3b55630dc70f;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

mm/mmap.c: remove redundant local variables for may_expand_vm()

Simplify may_expand_vm().

[akpm@linux-foundation.org: further simplification, per Naoya Horiguchi]
Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
Cc: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/mm/mmap.c b/mm/mmap.c
index 2ce04a649f6b..9da9c27c33a2 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -2988,14 +2988,7 @@ out:
  */
 int may_expand_vm(struct mm_struct *mm, unsigned long npages)
 {
-	unsigned long cur = mm->total_vm;	/* pages */
-	unsigned long lim;
-
-	lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
-
-	if (cur + npages > lim)
-		return 0;
-	return 1;
+	return mm->total_vm + npages <= rlimit(RLIMIT_AS) >> PAGE_SHIFT;
 }
 
 static int special_mapping_fault(struct vm_area_struct *vma,