From: Andrew Morton <akpm@linux-foundation.org>

fix it for Nick's page_check_address() interface change.

nfi if this is right, but I had a 50/50 chance.  Another victim of sucky
changelogging.

Cc: Dave Hansen <dave@linux.vnet.ibm.com>
Cc: Hugh Dickins <hugh@veritas.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Lee Schermerhorn <lee.schermerhorn@hp.com>
Cc: Matt Mackall <mpm@selenic.com>
Cc: Nick Piggin <npiggin@suse.de>
Cc: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/rmap.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN mm/rmap.c~mlock-mlocked-pages-are-unevictable-fix mm/rmap.c
--- a/mm/rmap.c~mlock-mlocked-pages-are-unevictable-fix
+++ a/mm/rmap.c
@@ -288,7 +288,7 @@ static int page_mapped_in_vma(struct pag
 	address = vma_address(page, vma);
 	if (address == -EFAULT)		/* out of vma range */
 		return 0;
-	pte = page_check_address(page, vma->vm_mm, address, &ptl);
+	pte = page_check_address(page, vma->vm_mm, address, &ptl, 1);
 	if (!pte)			/* the page is not in this mm */
 		return 0;
 	pte_unmap_unlock(pte, ptl);
_