commit ed4fc720e1912eb36ca654d03c88c48845ed39b2
author Linus Torvalds <torvalds@linux-foundation.org> Thu Jun 25 11:25:00 2009 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Thu Jun 25 11:25:00 2009 -0700
tree a6a91ff5f65fc740c873d958a0ed85b0cfa6607e
parent f4fa446883959c1c5f314a043e750dbfe3728c55
parent aa715284b4d28cabde6c25c568d769a6be712bc8

Merge branch 'futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  futex: request only one page from get_user_pages()

kernel/futex.c

diff --git a/kernel/futex.c b/kernel/futex.c
index 1c33711..794c862 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -299,7 +299,7 @@
 static int fault_in_user_writeable(u32 __user *uaddr)
 {
 	int ret = get_user_pages(current, current->mm, (unsigned long)uaddr,
-				 sizeof(*uaddr), 1, 0, NULL, NULL);
+				 1, 1, 0, NULL, NULL);
 	return ret < 0 ? ret : 0;
 }