diff --git a/[refs] b/[refs]
index d03846a37aad..5adf286d3375 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2bb71b5a44bfbe0d2066ee041149995f43b52d12
+refs/heads/master: 825020c3866e7312947e17a0caa9dd1a5622bafc
diff --git a/trunk/mm/mincore.c b/trunk/mm/mincore.c
index 566b6c2bae5f..8aca6f7167bb 100644
--- a/trunk/mm/mincore.c
+++ b/trunk/mm/mincore.c
@@ -142,7 +142,7 @@ asmlinkage long sys_mincore(unsigned long start, size_t len,
 		 * the temporary buffer size.
 		 */
 		down_read(&current->mm->mmap_sem);
-		retval = do_mincore(start, tmp, max(pages, PAGE_SIZE));
+		retval = do_mincore(start, tmp, min(pages, PAGE_SIZE));
 		up_read(&current->mm->mmap_sem);
 
 		if (retval <= 0)