From 1d405673c2cfd9b4950388a83e1e044bfe9022de Mon Sep 17 00:00:00 2001
From: Ying Han <yinghan@google.com>
Date: Tue, 29 May 2012 15:06:25 -0700
Subject: [PATCH] --- yaml --- r: 308841 b: refs/heads/master c:
 096a7cf44712ab531101bb4689f75f7fcd9b9f18 h: refs/heads/master i:   308839:
 1e0216aad2ca6877a0652b59d8f82cd371cd13db v: v3

---
 [refs]              | 2 +-
 trunk/mm/internal.h | 5 +++--
 trunk/mm/vmscan.c   | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index d770a00a90a5..699e26c857dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3ac9a8ade65ccbfd145fbff895ae8d8d62d09b0
+refs/heads/master: 096a7cf44712ab531101bb4689f75f7fcd9b9f18
diff --git a/trunk/mm/internal.h b/trunk/mm/internal.h
index aee4761cf9a9..8b0fc8da8028 100644
--- a/trunk/mm/internal.h
+++ b/trunk/mm/internal.h
@@ -164,7 +164,8 @@ static inline void munlock_vma_pages_all(struct vm_area_struct *vma)
  * to determine if it's being mapped into a LOCKED vma.
  * If so, mark page as mlocked.
  */
-static inline int is_mlocked_vma(struct vm_area_struct *vma, struct page *page)
+static inline int mlocked_vma_newpage(struct vm_area_struct *vma,
+				    struct page *page)
 {
 	VM_BUG_ON(PageLRU(page));
 
@@ -222,7 +223,7 @@ extern unsigned long vma_address(struct page *page,
 				 struct vm_area_struct *vma);
 #endif
 #else /* !CONFIG_MMU */
-static inline int is_mlocked_vma(struct vm_area_struct *v, struct page *p)
+static inline int mlocked_vma_newpage(struct vm_area_struct *v, struct page *p)
 {
 	return 0;
 }
diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c
index 8fffc65a84de..44f04364a304 100644
--- a/trunk/mm/vmscan.c
+++ b/trunk/mm/vmscan.c
@@ -3321,7 +3321,7 @@ int page_evictable(struct page *page, struct vm_area_struct *vma)
 	if (mapping_unevictable(page_mapping(page)))
 		return 0;
 
-	if (PageMlocked(page) || (vma && is_mlocked_vma(vma, page)))
+	if (PageMlocked(page) || (vma && mlocked_vma_newpage(vma, page)))
 		return 0;
 
 	return 1;