From 95a5b71d27488ff1d35de1b235bad6e2ca1cb0e1 Mon Sep 17 00:00:00 2001
From: Johannes Weiner <hannes@cmpxchg.org>
Date: Fri, 22 Feb 2013 16:35:20 -0800
Subject: [PATCH] --- yaml --- r: 356595 b: refs/heads/master c:
 4805b02e90187c68d8f4e3305c3482b797e35809 h: refs/heads/master i:   356593:
 62f0c2962aa50284c62851a9bbb76fdb1acf332b   356591:
 680883577ddb80eb7e5a9de7cb953aa561f0b5c9 v: v3

---
 [refs]           | 2 +-
 trunk/mm/mlock.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1a75349b5f7d..077934797a9c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3790144c9091631a18564aa64db8a971da02c41
+refs/heads/master: 4805b02e90187c68d8f4e3305c3482b797e35809
diff --git a/trunk/mm/mlock.c b/trunk/mm/mlock.c
index d6378feb2950..38db3b094105 100644
--- a/trunk/mm/mlock.c
+++ b/trunk/mm/mlock.c
@@ -185,6 +185,10 @@ long __mlock_vma_pages_range(struct vm_area_struct *vma,
 	if (vma->vm_flags & (VM_READ | VM_WRITE | VM_EXEC))
 		gup_flags |= FOLL_FORCE;
 
+	/*
+	 * We made sure addr is within a VMA, so the following will
+	 * not result in a stack expansion that recurses back here.
+	 */
 	return __get_user_pages(current, mm, addr, nr_pages, gup_flags,
 				NULL, NULL, nonblocking);
 }