---

yaml --- r: 44637 b: refs/heads/master c: 825020c h: refs/heads/master i: 44635: 5292a23 v: v3
git-mirror · Dec 17, 2006 · 90c3c7d · 90c3c7d
1 parent c0538b7
commit 90c3c7d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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)