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
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...
[pandora-kernel.git]
/
kernel
/
futex.c
diff --git
a/kernel/futex.c
b/kernel/futex.c
index
3fbc76c
..
0a30897
100644
(file)
--- a/
kernel/futex.c
+++ b/
kernel/futex.c
@@
-355,8
+355,8
@@
static int fault_in_user_writeable(u32 __user *uaddr)
int ret;
down_read(&mm->mmap_sem);
- ret =
get_user_pages
(current, mm, (unsigned long)uaddr,
-
1, 1, 0, NULL, NULL
);
+ ret =
fixup_user_fault
(current, mm, (unsigned long)uaddr,
+
FAULT_FLAG_WRITE
);
up_read(&mm->mmap_sem);
return ret < 0 ? ret : 0;