diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-25 14:25:00 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-25 14:25:00 -0400 |
commit | ed4fc720e1912eb36ca654d03c88c48845ed39b2 (patch) | |
tree | a6a91ff5f65fc740c873d958a0ed85b0cfa6607e | |
parent | f4fa446883959c1c5f314a043e750dbfe3728c55 (diff) | |
parent | aa715284b4d28cabde6c25c568d769a6be712bc8 (diff) |
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()
-rw-r--r-- | kernel/futex.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index 1c337112335c..794c862125fe 100644 --- a/kernel/futex.c +++ b/kernel/futex.c | |||
@@ -299,7 +299,7 @@ void put_futex_key(int fshared, union futex_key *key) | |||
299 | static int fault_in_user_writeable(u32 __user *uaddr) | 299 | static int fault_in_user_writeable(u32 __user *uaddr) |
300 | { | 300 | { |
301 | int ret = get_user_pages(current, current->mm, (unsigned long)uaddr, | 301 | int ret = get_user_pages(current, current->mm, (unsigned long)uaddr, |
302 | sizeof(*uaddr), 1, 0, NULL, NULL); | 302 | 1, 1, 0, NULL, NULL); |
303 | return ret < 0 ? ret : 0; | 303 | return ret < 0 ? ret : 0; |
304 | } | 304 | } |
305 | 305 | ||