git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
perf: Rework/fix the whole read vs group stuff
[pandora-kernel.git]
/
kernel
/
futex.c
diff --git
a/kernel/futex.c
b/kernel/futex.c
index
1c33711
..
0672ff8
100644
(file)
--- a/
kernel/futex.c
+++ b/
kernel/futex.c
@@
-247,6
+247,7
@@
again:
if (err < 0)
return err;
if (err < 0)
return err;
+ page = compound_head(page);
lock_page(page);
if (!page->mapping) {
unlock_page(page);
lock_page(page);
if (!page->mapping) {
unlock_page(page);
@@
-299,7
+300,7
@@
void put_futex_key(int fshared, union futex_key *key)
static int fault_in_user_writeable(u32 __user *uaddr)
{
int ret = get_user_pages(current, current->mm, (unsigned long)uaddr,
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;
}
return ret < 0 ? ret : 0;
}